diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 425308d..35498ca 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -11,8 +11,11 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-      - run: docker build api/
+      - run: docker build api/ -t api-test
+      - run: docker rmi api-test
       - run: |
           docker build \
             --build-arg="PUBLIC_BASE_API_URL=${{ vars.PUBLIC_BASE_API_URL }}" \
+            -t view-test \
             view/
+      - run: docker rmi view-test
diff --git a/.gitea/workflows/buildAndPush.yaml b/.gitea/workflows/buildAndPush.yaml
index 6088d83..6df52b6 100644
--- a/.gitea/workflows/buildAndPush.yaml
+++ b/.gitea/workflows/buildAndPush.yaml
@@ -18,6 +18,7 @@ jobs:
             api/
       - run: docker push git.wundenbergs.de/tim/me-fit/api:latest
       - run: docker push git.wundenbergs.de/tim/me-fit/api:$GITHUB_SHA
+      - run: docker rmi git.wundenbergs.de/tim/me-fit/api:latest git.wundenbergs.de/tim/me-fit/api:$GITHUB_SHA
       - run: |
           docker build \
             --build-arg="PUBLIC_BASE_API_URL=${{ vars.PUBLIC_BASE_API_URL }}" \
@@ -26,3 +27,4 @@ jobs:
             view/
       - run: docker push git.wundenbergs.de/tim/me-fit/view:latest
       - run: docker push git.wundenbergs.de/tim/me-fit/view:$GITHUB_SHA
+      - run: docker rmi git.wundenbergs.de/tim/me-fit/view:latest git.wundenbergs.de/tim/me-fit/view:$GITHUB_SHA