diff --git a/defaults/main.yml b/defaults/main.yml
index 1dfa522..79999d7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -36,6 +36,9 @@ jitsi_enable_transcriber: false
 jitsi_enable_etherpad: false
 jitsi_enable_whiteboard: false
 
+jitsi_etherpad_port: 8002
+jitsi_etherpad_domain: "pad.meet.example.com"
+
 # Jitsi passwords.
 #
 # IMPORTANT:
diff --git a/handlers/main.yml b/handlers/main.yml
index 2681402..bf72244 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,8 +1,13 @@
 ---
 - name: Restart Jitsi
-  ansible.builtin.command:
-    cmd: "docker compose {{ jitsi_compose_args }} up -d"
-    chdir: "{{ jitsi_install_dir }}"
+  block:
+    - ansible.builtin.command:
+      cmd: "docker compose {{ jitsi_compose_args }} down"
+      chdir: "{{ jitsi_install_dir }}"
+
+    - ansible.builtin.command:
+      cmd: "docker compose {{ jitsi_compose_args }} up -d"
+      chdir: "{{ jitsi_install_dir }}"
 
 - name: Reload systemd
   ansible.builtin.systemd:
diff --git a/tasks/config.yml b/tasks/config.yml
index 945c119..c8df8fe 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -56,3 +56,12 @@
     group: root
     mode: "0600"
   notify: Restart Jitsi
+
+- name: etherpad overrides
+  ansible.builtin.template:
+    src: etherpad-override.yml
+    dest: "{{ jitsi_install_dir }}/etherpad-override.yml"
+    owner: root
+    group: root
+    mode: "0600"
+  notify: Restart Jitsi
diff --git a/templates/env.j2 b/templates/env.j2
index eab895a..4226960 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -25,6 +25,8 @@ ENABLE_HTTP_REDIRECT={{ 1 if jitsi_enable_http_redirect else 0 }}
 
 JVB_COLIBRI_PORT={{ jitsi_jvb_colibri_port }}
 
+ETHERPAD_PUBLIC_URL=https://{{ jitsi_etherpad_domain }}/p/
+
 ENABLE_AUTH={{ 1 if jitsi_enable_auth else 0 }}
 ENABLE_GUESTS={{ 1 if jitsi_enable_guests else 0 }}
 AUTH_TYPE={{ jitsi_auth_type }}
@@ -38,9 +40,6 @@ JIBRI_RECORDER_PASSWORD={{ jitsi_jibri_recorder_password }}
 JIBRI_XMPP_PASSWORD={{ jitsi_jibri_xmpp_password }}
 
 
-ENABLE_ETHERPAD={{ 1 if jitsi_enable_etherpad else 0 }}
-ENABLE_WHITEBOARD={{ 1 if jitsi_enable_whiteboard else 0 }}
-
 {% for key, value in jitsi_extra_env.items() %}
 {{ key }}={{ value }}
 {% endfor %}
\ No newline at end of file
diff --git a/templates/etherpad-override.yml b/templates/etherpad-override.yml
new file mode 100644
index 0000000..c61f837
--- /dev/null
+++ b/templates/etherpad-override.yml
@@ -0,0 +1,4 @@
+services:
+  etherpad:
+    ports:
+      - "127.0.0.1:{{ jitsi_etherpad_port }}:9001"