diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index d4bcd027d..c9f783453 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -3858,6 +3858,10 @@ devture_container_socket_proxy_api_containers_enabled: true
 # See the comment there for more details about why we have both `devture_traefik_enabled` and `matrix_playbook_traefik_role_enabled`.
 devture_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type == 'playbook-managed-traefik' }}"
 
+devture_traefik_identifier: matrix-traefik
+
+devture_traefik_base_path: "{{ matrix_base_data_path }}/traefik"
+
 devture_traefik_uid: "{{ matrix_user_uid }}"
 devture_traefik_gid: "{{ matrix_user_gid }}"
 
diff --git a/roles/custom/matrix-base/templates/bin/remove-all.j2 b/roles/custom/matrix-base/templates/bin/remove-all.j2
index 46e1f7573..2733ad784 100644
--- a/roles/custom/matrix-base/templates/bin/remove-all.j2
+++ b/roles/custom/matrix-base/templates/bin/remove-all.j2
@@ -21,19 +21,16 @@ else
 		rm -f {{ devture_systemd_docker_base_systemd_path }}/$s
 	done
 
-    echo "Stop and remove devture services"
-
-	for s in $(find {{ devture_systemd_docker_base_systemd_path }}/ -type f -name "devture-*" -printf "%f\n"); do
-		systemctl disable --now $s
-		rm -f {{ devture_systemd_docker_base_systemd_path }}/$s
-	done
-
 	systemctl daemon-reload
 
 	echo "Remove unused Docker images and resources"
 	docker system prune -af
+
 	echo "Remove Docker matrix network (should be gone already, but ..)"
 	docker network rm {{ matrix_docker_network }}
+
+	echo "This playbook creates a lot of matrix-* networks. Consider removing them manually ('docker network ls', followed by 'docker network rm NETWORK_NAME')"
+
 	echo "Remove {{ matrix_base_data_path }} directory"
 	rm -fr "{{ matrix_base_data_path }}"
 	exit 0
diff --git a/roles/custom/matrix_playbook_migration/tasks/devture_traefik_to_matrix_traefik.yml b/roles/custom/matrix_playbook_migration/tasks/devture_traefik_to_matrix_traefik.yml
new file mode 100644
index 000000000..7d1b1190d
--- /dev/null
+++ b/roles/custom/matrix_playbook_migration/tasks/devture_traefik_to_matrix_traefik.yml
@@ -0,0 +1,35 @@
+---
+
+# This migrates Traefik from the old path (`/devture-traefik`) to the new path (`/matrix/traefik`, controlled by `devture_traefik_base_path`),
+# and from the old hardcoded systemd service name (`devture-traefik.service`) to the new one (`matrix-traefik.service`, controlled by `devture_traefik_identifier`).
+#
+# Here, we merely disable (and stop) the old systemd service and relocate the data (`/devture-traefik` directory).
+# The Traefik role itself (running later) will then ensure this data is up-to-date and will set up the new systemd service.
+
+# It only makes sense to migrate if the identifier or path are different than the default (what we were using before).
+- when: "devture_traefik_identifier != 'devture-postgres' or devture_traefik_base_path != '/devture-traefik'"
+  block:
+    - name: Check existence of devture-traefik.service systemd service
+      ansible.builtin.stat:
+        path: "{{ devture_systemd_docker_base_systemd_path }}/devture-traefik.service"
+      register: devture_traefik_service_stat
+
+    - when: devture_traefik_service_stat.stat.exists | bool
+      block:
+        - name: Ensure devture-traefik.service systemd service is stopped
+          ansible.builtin.systemd:
+            name: devture-traefik
+            state: stopped
+            enabled: false
+            daemon_reload: true
+
+        - name: Ensure Traefik systemd service doesn't exist
+          ansible.builtin.file:
+            path: "{{ devture_systemd_docker_base_systemd_path }}/devture-traefik.service"
+            state: absent
+
+        - name: Ensure Traefik directory relocated
+          ansible.builtin.command:
+            cmd: "mv /devture-traefik {{ devture_traefik_base_path }}"
+            creates: "{{ devture_traefik_base_path }}"
+            removes: "/devture-traefik"
diff --git a/roles/custom/matrix_playbook_migration/tasks/main.yml b/roles/custom/matrix_playbook_migration/tasks/main.yml
index 96b68b60d..e2b293847 100644
--- a/roles/custom/matrix_playbook_migration/tasks/main.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/main.yml
@@ -11,3 +11,12 @@
   tags:
     - setup-all
     - install-all
+
+- when: matrix_playbook_traefik_role_enabled | bool
+  block:
+    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/devture_traefik_to_matrix_traefik.yml"
+  tags:
+    - setup-all
+    - install-all
+    - setup-traefik
+    - install-traefik