diff --git a/Makefile b/Makefile
index 817212c..0dd8b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -295,6 +295,8 @@ docker-swarm-deploy: ## ????????? ???????
 	@set RELEASE_COOKIE=$$(grep RELEASE_COOKIE docker/.env | cut -d '=' -f2)
 	@set JWT_SECRET=$$(grep JWT_SECRET docker/.env | cut -d '=' -f2)
 	@docker stack deploy -c docker/docker-compose.swarm.yml eventhub --detach=true
+	@bash ../EventHubDevOps/scripts/setup-docker-container-prune.sh 2>/dev/null || true
+	@bash ../EventHubDevOps/scripts/docker-container-prune-now.sh 2>/dev/null || true
 	@echo "? ??????? ???????"
 	@echo "Admin UI: https://admin-ui.stage.eventhub.local"
 
diff --git a/docker/docker-compose.stage.yml b/docker/docker-compose.stage.yml
index d317006..b83d145 100644
--- a/docker/docker-compose.stage.yml
+++ b/docker/docker-compose.stage.yml
@@ -17,6 +17,7 @@ services:
     networks:
       - eventhub-net
     deploy:
+      task-history-limit: 1
       replicas: 1
       restart_policy:
         condition: any
@@ -54,6 +55,7 @@ services:
       retries: 3
       start_period: 30s
     deploy:
+      task-history-limit: 1
       replicas: 1
       endpoint_mode: dnsrr
       restart_policy:
@@ -75,6 +77,7 @@ services:
     depends_on:
       - eventhub
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
diff --git a/docker/docker-compose.swarm.yml b/docker/docker-compose.swarm.yml
index f177c06..ad30d6c 100644
--- a/docker/docker-compose.swarm.yml
+++ b/docker/docker-compose.swarm.yml
@@ -36,6 +36,7 @@ services:
     networks:
       - eventhub-net
     deploy:
+      task-history-limit: 1
       replicas: 1
       restart_policy:
         condition: any
@@ -46,6 +47,7 @@ services:
     networks:
       - eventhub-net
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -80,6 +82,7 @@ services:
         source: eventhub-data
         target: /app/data
     deploy:
+      task-history-limit: 1
       replicas: 1
       endpoint_mode: dnsrr
       restart_policy:
@@ -95,6 +98,7 @@ services:
     depends_on:
       - eventhub
     deploy:
+      task-history-limit: 1
       replicas: 1
       restart_policy:
         condition: any
@@ -119,6 +123,7 @@ services:
     ports:
       - "9090:9090"
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -139,6 +144,7 @@ services:
     ports:
       - "3000:3000"
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -159,6 +165,7 @@ services:
     networks:
       - eventhub-net
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -173,6 +180,7 @@ services:
     ports:
       - "4000:4000"
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -185,6 +193,7 @@ services:
     networks:
       - eventhub-net
     deploy:
+      task-history-limit: 1
       replicas: 0
       restart_policy:
         condition: any
@@ -209,6 +218,7 @@ services:
     depends_on:
       - eventhub
     deploy:
+      task-history-limit: 1
       mode: replicated
       replicas: 1
       restart_policy: