diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java
index 94a4f36a..1d8d85f7 100644
--- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java
+++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java
@@ -14,5 +14,3 @@ public static void main(String[] args) {
 		org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
 	}
 }
-
-
diff --git a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java
index 2460ef23..a08337be 100644
--- a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java
+++ b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java
@@ -13,4 +13,3 @@ public static void main(String[] args) {
 		SpringApplication.run(ApiUserApplication.class, args);
 	}
 }
-
diff --git a/scripts/deploy-admin-docker.sh b/scripts/deploy-admin-docker.sh
index 3c2f7733..93297fbb 100644
--- a/scripts/deploy-admin-docker.sh
+++ b/scripts/deploy-admin-docker.sh
@@ -18,6 +18,9 @@ else
   echo "No admin container found."
 fi
 
+echo "Cleaning up old containers…"
+docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin down
+
 echo "3. start container"
 sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin pull nowait-app-admin-api prometheus-admin grafana-admin
 sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin up -d nowait-app-admin-api prometheus-admin grafana-admin
diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh
index 232d21e6..46c78a4f 100644
--- a/scripts/deploy-user-docker.sh
+++ b/scripts/deploy-user-docker.sh
@@ -15,9 +15,12 @@ if [ -n "$CONTAINER_ID" ]; then
   echo "Stopping container $CONTAINER_ID"
   docker rm -f "$CONTAINER_ID"
 else
-  echo "No admin container found."
+  echo "No User container found."
 fi
 
+echo "Cleaning up old containers…"
+docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user down
+
 echo "3. start container"
 sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user pull nowait-app-user-api prometheus-user grafana-user
 sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user up -d nowait-app-user-api prometheus-user grafana-user