diff --git a/deploy_jitsi.sh b/deploy_jitsi.sh
index 037249b..baec963 100755
--- a/deploy_jitsi.sh
+++ b/deploy_jitsi.sh
@@ -195,7 +195,8 @@ function do_app {
     --helm-set fqdn=${FQDN} \
     --helm-set jitsi-meet.publicURL=https://${FQDN} \
     --helm-set jitsi-meet.jvb.publicIP=${PUBLIC_IP} \
-    --helm-set jitsi-meet.jvb.UDPPort=${JVB_PORT}
+    --helm-set jitsi-meet.jvb.UDPPort=${JVB_PORT} \
+    --helm-set jitsi-meet.web.extraEnvs.ETHERPAD_URL_BASE=http://${HELM_NAME}-etherpad.${NAMESPACE}.svc:9001
 
   sleep 5 # there is a race if sync happens too quickly, so that it becomes a partial sync
   argocd app sync ${HELM_NAME}
diff --git a/jitsi/templates/etherpad/deployment.yaml b/jitsi/templates/etherpad/deployment.yaml
new file mode 100644
index 0000000..a3ce8d6
--- /dev/null
+++ b/jitsi/templates/etherpad/deployment.yaml
@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-etherpad
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etherpad
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: etherpad
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: etherpad
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: etherpad
+          image: "etherpad/etherpad:1.8.18"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 9001
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.etherpad.resources | nindent 12 }}
diff --git a/jitsi/templates/etherpad/service.yaml b/jitsi/templates/etherpad/service.yaml
new file mode 100644
index 0000000..c15dade
--- /dev/null
+++ b/jitsi/templates/etherpad/service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-etherpad
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etherpad
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: 9001
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: etherpad
+    app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/jitsi/values.yaml b/jitsi/values.yaml
index 7ff6811..13bde9c 100755
--- a/jitsi/values.yaml
+++ b/jitsi/values.yaml
@@ -3,12 +3,17 @@ certResolver: le-staging
 
 fqdn: ""
 
+etherpad:
+  resources: {}
+
 jitsi-meet:
   publicURL: ""
 
   tz: Asia/Shanghai
 
   web:
+    extraEnvs:
+      ETHERPAD_URL_BASE: ""
     ingress:
       enabled: false