diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index f0f07c5..16f4f95 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -15,10 +15,10 @@ jobs:
           registry: gitea.nelson-household.com  # Replace with your Gitea domain
           username: ${{ gitea.actor }}
           password: ${{ secrets.RUNNER_TOKEN }}
-      - name: Delete Old Images and Containers
+      - name: Delete Old Images and Containers (Docker versions < 1.10)
         run: |
-          CONTAINERS=$(docker ps -aqf "reference=gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader" || true)
-          IMAGES=$(docker images --filter "reference=gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader" -q)
+          CONTAINERS=$(docker ps -aq '--filter=reference='$(echo gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader | grep -oE '[^/]+' | head -1) || true)
+          IMAGES=$(docker images -q '--filter=reference='$(echo gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader | grep -oE '[^/]+' | head -1) || true)
           if [ ! -z "$CONTAINERS" ]; then
             echo "Deleting Containers:"
             docker rm $CONTAINERS
@@ -27,6 +27,32 @@ jobs:
             echo "Deleting Images:"
             docker rmi $IMAGES
           fi
+      - name: Delete Old Images and Containers (Docker version >= 1.10)
+        if: | docker version --format '{{ .Server.Version }}' | grep -q '1.10' || true; then
+          run: |
+            CONTAINERS=$(docker ps -aq --filter reference=gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader || true)
+            IMAGES=$(docker images -q --filter reference=gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader || true)
+            if [ ! -z "$CONTAINERS" ]; then
+              echo "Deleting Containers:"
+              docker rm $CONTAINERS
+            fi
+            if [ ! -z "$IMAGES" ]; then
+              echo "Deleting Images:"
+              docker rmi $IMAGES
+            fi
+        else
+          run: |
+            CONTAINERS=$(docker ps -aq '--filter=reference='$(echo gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader | grep -oE '[^/]+' | head -1) || true)
+            IMAGES=$(docker images -q '--filter=reference='$(echo gitea\.nelson-household\.com\/joseph\.nelson4456\/koillection-uploader\/koilcollection-uploader | grep -oE '[^/]+' | head -1) || true)
+            if [ ! -z "$CONTAINERS" ]; then
+              echo "Deleting Containers:"
+              docker rm $CONTAINERS
+            fi
+            if [ ! -z "$IMAGES" ]; then
+              echo "Deleting Images:"
+              docker rmi $IMAGES
+            fi
+        endif
       - name: Build and Push Image
         run: |
           docker build -t gitea.nelson-household.com/joseph.nelson4456/koillection-uploader/koilcollection-uploader:${{ github.sha }} .