diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 009af06..84858e0 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -21,11 +21,5 @@ jobs:
 
       - name: Build Docker images
         working-directory: ./docker
-        run: |
-          ./build-api-images
+        run: ./build-api-images
 
-      - name: Push Docker images
-        working-directory: ./docker
-        run: |
-          ./push-api-images
-          
diff --git a/docker/build-api-images b/docker/build-api-images
index 10f6aeb..98bf5c8 100755
--- a/docker/build-api-images
+++ b/docker/build-api-images
@@ -20,4 +20,14 @@ for base in "${bases[@]}"; do
     --build-arg cuda_version=$cuda_version \
     --build-arg api_version=$api_version \
     .
-done
\ No newline at end of file
+  docker push ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-$base
+
+  if [ $base == "runtime" ]; then
+    docker tag ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-runtime ghcr.io/saladtechnologies/comfyui-api:latest
+    docker push ghcr.io/saladtechnologies/comfyui-api:latest
+    docker image rm ghcr.io/saladtechnologies/comfyui-api:latest
+  fi
+
+   # Remove the image to make space for the next one. Github actions runners don't get much storage.
+  docker image rm ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-$base
+done
diff --git a/docker/push-api-images b/docker/push-api-images
deleted file mode 100755
index 74af84b..0000000
--- a/docker/push-api-images
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/bash
-
-usage="Usage: $0 [comfy_version] [torch_version] [cuda_version] [api_version]"
-
-comfy_version=${1:-0.3.14}
-torch_version=${2:-2.6.0}
-cuda_version=${3:-12.4}
-
-current_api_version=$(cat ../package.json | jq -r '.version')
-api_version=${4:-$current_api_version}
-
-bases=("devel" "runtime")
-
-for base in "${bases[@]}"; do
-  docker push ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-$base
-done
-
-docker tag ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-runtime ghcr.io/saladtechnologies/comfyui-api:latest
-docker push ghcr.io/saladtechnologies/comfyui-api:latest
\ No newline at end of file