diff --git a/app/Actions/Server/CleanupDocker.php b/app/Actions/Server/CleanupDocker.php
index 82515ab6b..b38e5765b 100644
--- a/app/Actions/Server/CleanupDocker.php
+++ b/app/Actions/Server/CleanupDocker.php
@@ -11,36 +11,29 @@ class CleanupDocker
 
     public function handle(Server $server, bool $force = true)
     {
-        $commonCommands = [
-            'docker container prune -f --filter "label=coolify.managed=true"',
-            'docker image prune -f',
-            'docker builder prune -f',
-            'docker network prune -f',
-        ];
-
-        $forceCommands = [
-            'docker container rm $(docker container ls -aq --filter status=exited --filter status=created)',
-            'docker image prune -af',
-            'docker builder prune -af',
-            'docker system prune -af',
-            'docker network prune -f',
-        ];
-
-        $additionalCommands = [
-            'docker rmi $(docker images -f "dangling=true" -q)',
-            'docker network rm $(docker network ls -q -f "unused=true")',
-            'docker system prune -f',
-        ];
-
-        if ($force) {
-            $commands = array_merge($forceCommands, $commonCommands, $additionalCommands);
-            $commands[] = 'docker rm $(docker ps -a -q --filter status=exited --filter status=created)';
-        } else {
-            $commands = array_merge($commonCommands, $additionalCommands);
-        }
+        $commands = $this->getCommands($force);
 
         foreach ($commands as $command) {
             instant_remote_process([$command], $server, false);
         }
     }
+
+    private function getCommands(bool $force): array
+    {
+        $commonCommands = [
+            'docker container prune -f --filter "label=coolify.managed=true"',
+            'docker image prune -f',
+            'docker builder prune -f',
+        ];
+
+        if ($force) {
+            return array_merge([
+                'docker container rm $(docker container ls -aq --filter status=exited --filter "label=coolify.managed=true")',
+                'docker image prune -af',
+                'docker builder prune -af',
+            ], $commonCommands);
+        }
+
+        return $commonCommands;
+    }
 }