diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 2989362..aa9ada2 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -17,8 +17,8 @@ jobs:
           password: ${{ secrets.RUNNER_TOKEN }}
       - name: Delete Old Images and Containers
         run: |
-          docker rm $(docker ps -a -q -f "name=tcg-collectors-server")
-          docker rmi $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "tcg-collectors-server")
+          docker ps -a -q -f "name=tcg-collectors-server" | xargs -I {} docker rm {} || true
+          docker images --format "{{.Repository}}:{{.Tag}}" | grep "tcg-collectors-server" | xargs -I {} docker rmi {} || true
       - name: Build and Push Image
         run: |
           docker build -t gitea.nelson-household.com/Hard-at-Work/tcg-collectors-server/tcg-collectors-server:${{ github.sha }} .