diff --git a/.gitea/workflows/test_build_and_push.yaml b/.gitea/workflows/test_build_and_push.yaml
index c77bbef..d6deb9d 100644
--- a/.gitea/workflows/test_build_and_push.yaml
+++ b/.gitea/workflows/test_build_and_push.yaml
@@ -19,61 +19,38 @@ jobs:
         run: ./shellcheck.sh
   buildpush:
     name: build_and_push
-    needs: [tests_shellcheck]
+    needs: [test_shellcheck]
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image:
+          - name: postgres-backup
+            path: postgres-backup
+          - name: pyweb
+            path: pyweb
+          - name: shellcheck
+            path: shellcheck
+          - name: vaultwarden-backup
+            path: vaultwarden-backup
+          - name: metabase
+            path: metabase
     steps:
       - uses: actions/checkout@v4
-      - name: Kaniko build postgres-backup
-        uses: aevea/action-kaniko@master
-        with:
-          image: uleenucks/postgres-backup
-          tag: latest
-          path: postgres-backup
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          cache: false
-          extra_args: --cleanup
 
-      - name: Kaniko build pyweb
-        uses: aevea/action-kaniko@master
+      - name: Build ${{ matrix.image.name }} image
+        id: build
+        uses: redhat-actions/buildah-build@v2
         with:
-          image: uleenucks/pyweb
-          tag: latest
-          path: pyweb
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          cache: false
-          extra_args: --cleanup
+          image: uleenucks/${{ matrix.image.name }}
+          tags: latest
+          containerfiles: |
+            ${{ matrix.image.path }}/Dockerfile
 
-      - name: Kaniko build shellcheck
-        uses: aevea/action-kaniko@master
+      - name: Push ${{ matrix.image.name }} to Docker Hub
+        uses: redhat-actions/push-to-registry@v2
         with:
-          image: uleenucks/shellcheck
-          tag: latest
-          path: shellcheck
+          image: ${{ steps.build.outputs.image }}
+          tags: ${{ steps.build.outputs.tags }}
+          registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          cache: false
-          extra_args: --cleanup
-
-      - name: Kaniko build vaultwarden-backup
-        uses: aevea/action-kaniko@master
-        with:
-          image: uleenucks/vaultwarden-backup
-          tag: latest
-          path: vaultwarden-backup
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          cache: false
-          extra_args: --cleanup
-
-      - name: Kaniko build metabase
-        uses: aevea/action-kaniko@master
-        with:
-          image: uleenucks/metabase
-          tag: latest
-          path: metabase
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          cache: false
-          extra_args: --cleanup