diff --git a/roles/custom/matrix-base/templates/bin/remove-all.j2 b/roles/custom/matrix-base/templates/bin/remove-all.j2
index 5dd862ae..46e1f757 100644
--- a/roles/custom/matrix-base/templates/bin/remove-all.j2
+++ b/roles/custom/matrix-base/templates/bin/remove-all.j2
@@ -21,6 +21,13 @@ 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"