diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml
index 3a60638..d00781e 100644
--- a/.forgejo/workflows/docker.yml
+++ b/.forgejo/workflows/docker.yml
@@ -11,17 +11,19 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: Install Podman
-        run: |
-          apt update && apt install -y podman
-          echo 'unqualified-search-registries=["docker.io"]' >> /etc/containers/registries.conf
+      - run: |
+          apt update && apt install -y docker.io
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to Forgejo Container Registry
-        run: echo "${{ secrets.FORGEJO_TOKEN }}" | podman login ${{ forgejo.server_url }} -u ${{ forgejo.actor }} --password-stdin
-      - name: Build image
-        run: podman build -t git.tiramisu.one/drew/captains-log-backend backend/
-      - name: Push image
-        run: podman push git.tiramisu.one/drew/captains-log-backend
+        run: echo "${{ secrets.FORGEJO_TOKEN }}" | docker login ${{ forgejo.server_url }} -u ${{ forgejo.actor }} --password-stdin
 
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./backend
+          push: true
+          tags: git.tiramisu.one/drew/captains-log-backend
 
   docker-frontend:
     name: Build and Push Frontend Image
@@ -29,13 +31,16 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-      - name: Install Podman
-        run: |
-          apt update && apt install -y podman
-          echo 'unqualified-search-registries=["docker.io"]' >> /etc/containers/registries.conf
+      - run: |
+          apt update && apt install -y docker.io
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to Forgejo Container Registry
-        run: echo "${{ secrets.FORGEJO_TOKEN }}" | podman login ${{ forgejo.server_url }} -u ${{ forgejo.actor }} --password-stdin
-      - name: Build image
-        run: podman build -t git.tiramisu.one/drew/captains-log-frontend frontend/
-      - name: Push image
-        run: podman push git.tiramisu.one/drew/captains-log-frontend 
+        run: echo "${{ secrets.FORGEJO_TOKEN }}" | docker login ${{ forgejo.server_url }} -u ${{ forgejo.actor }} --password-stdin
+
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          push: true
+          tags: git.tiramisu.one/drew/captains-log-frontend