diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index a76d0c2..931a386 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -14,32 +14,35 @@ jobs:
         run: echo "NOW=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_ENV
       - name: Fix for bad os check
         run: echo "RUNNER_OS=Linux" >> $GITHUB_ENV
-      - name: Login to Forgejo Registry
-        uses: https://cremin.dev/actions/podman-login@v1
+      - name: Login to Docker Hub
+        uses: https://cremin.dev/actions/docker-login@v3
         with:
           registry: cremin.dev
           username: ${{ github.actor }}
           password: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
-          logout: false
       - name: Check out repository
         uses: https://cremin.dev/actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: https://cremin.dev/actions/docker-setup-buildx@v3
+      - name: Build and push
+        uses: https://cremin.dev/actions/docker-build-push@v6
+        with:
+          push: true
+          tags: user/app:latest
       - name: Build image
         uses: https://cremin.dev/actions/buildah-build@v2
         with:
-          containerfiles: ./Containerfile
+          file: ./Containerfile
           context: ./
-          oci: true
-          layers: true
           image: cremin.dev/jonathan/hostr
           tags: latest ${{ github.sha }}
       - name: Push image
         uses: https://cremin.dev/actions/push-to-registry@v2
         with:
-          registry: cremin.dev
+          registry:
           username: ${{ github.actor }}
           password: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
-          image: jonathan/hostr
-          tags: latest ${{ github.sha }}
+          tags: cremin.dev/jonathan/hostr:latest cremin.dev/jonathan/hostr:${{ github.sha }}
   test-image:
     runs-on: self-hosted
     needs: build-image
@@ -76,4 +79,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: 0kWP/ZkgIwQzgL9t4SGv9Uc93rO//OdyqMH329b/
           AWS_BUCKET: hostr
         run: |
-          podman run --rm --env-host -it cremin.dev/jonathan/hostr:${{ github.sha }} yarn test
+          docker run --rm --env-host -it cremin.dev/jonathan/hostr:${{ github.sha }} yarn test