diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index c46d44d..b383951 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -71,6 +71,9 @@ jobs:
             echo "📦 Loading image"
             docker load < /tmp/merchbay_dev.tar.gz
 
+            echo "🧹 Removing old merchbay images"
+            docker images | grep merchbay | grep -v "$(docker images merchbay:dev -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
+
             echo "📄 Updating compose file"
             cp /tmp/docker-compose.yml "$DEPLOY_DIR/"
 
@@ -113,7 +116,11 @@ jobs:
 
             echo "🧹 Cleanup"
             rm -f /tmp/merchbay_dev.tar.gz /tmp/docker-compose.yml
-            docker image prune -f
+            
+            echo "🧹 Pruning unused Docker resources"
+            docker image prune -af --filter "until=24h" || true
+            docker container prune -f || true
+            docker system df
 
             echo "✅ Deployment completed"
           EOF
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 1addd0e..0058f9a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -47,6 +47,10 @@ jobs:
             mkdir -p \$DEPLOY_DIR
             cd /tmp
             docker load < merchbay.tar.gz
+            
+            echo 'Removing old merchbay images'
+            docker images | grep merchbay | grep -v "\$(docker images merchbay:latest -q)" | awk '{print \$3}' | xargs -r docker rmi -f || true
+            
             cp docker-compose.yml \$DEPLOY_DIR/
             cd \$DEPLOY_DIR
             
@@ -67,6 +71,12 @@ jobs:
             docker compose exec -T app php artisan route:cache
             docker compose exec -T app php artisan view:cache
             rm -f /tmp/merchbay.tar.gz /tmp/docker-compose.yml
+            
+            echo 'Pruning unused Docker resources'
+            docker image prune -af --filter "until=24h" || true
+            docker container prune -f || true
+            docker system df
+            
             echo 'Production deployment completed successfully!'
             echo 'Application available at: https://merchbay.app'
           "