diff --git a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker-compose.j2 b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker-compose.j2
index 8683009851..606b3697c4 100644
--- a/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker-compose.j2
+++ b/deploy/ansible/appsmith_playbook/roles/generate_template/templates/docker-compose.j2
@@ -71,7 +71,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     # Update check interval in seconds.
-    command: --interval 300 --label-enable
+    command: --interval 300 --label-enable --cleanup
     networks:
       - appsmith
 
diff --git a/deploy/template/docker-compose.yml.sh b/deploy/template/docker-compose.yml.sh
index ac10623316..07520e05f0 100644
--- a/deploy/template/docker-compose.yml.sh
+++ b/deploy/template/docker-compose.yml.sh
@@ -80,7 +80,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     # Update check interval in seconds.
-    command: --interval 300 --label-enable
+    command: --interval 300 --label-enable --cleanup
     networks:
       - appsmith