diff --git a/Jenkinsfile b/Jenkinsfile
index e61c101..4f270d5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,9 +46,9 @@ pipeline {
                     #!/bin/bash
                     docker-compose down
 
-                    docker stop linuxbuilder || true
+                    docker stop linuxagent || true
                     docker stop linuxfs || true
-                    docker stop arch || true
+                    docker stop archagent || true
                     '''
                 }
             }
@@ -224,6 +224,11 @@ pipeline {
                     '''
                 }
             }
+            post {
+                always {
+                    cleanWs()
+                }
+            }
         }
     }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 07f195f..4a7427e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   linuxbuilder:
     image: linuxagent
-    container_name: linuxbuilder
+    container_name: linuxagent
     restart: unless-stopped
     env_file: .env
     networks:
@@ -17,7 +17,7 @@ services:
       - buildenv
   arch:
     image: archagent
-    container_name: arch
+    container_name: archagent
     restart: unless-stopped
     env_file: .env
     networks: