diff --git a/.forgejo/workflows/os.yml b/.forgejo/workflows/os.yml
index 9d6a648..801134a 100644
--- a/.forgejo/workflows/os.yml
+++ b/.forgejo/workflows/os.yml
@@ -17,6 +17,8 @@ on:
 env:
   REGISTRY: forge.pc-rytteren.dk
   IMAGE_NAME: ${{ github.repository }}
+  STORAGE_DRIVER: vfs
+  PODMAN_USERNS: disabled
 
 jobs:
   build:
@@ -28,6 +30,16 @@ jobs:
 
     steps:
 
+      - name: Configure Buildah storage
+        run: |
+          mkdir -p ~/.config/containers
+          cat > ~/.config/containers/storage.conf <<EOF
+          [storage]
+          driver = "vfs"
+          runroot = "/tmp/run"
+          graphroot = "/tmp/storage"
+          EOF
+
       - name: Get current date
         id: date
         run: echo "date=$(date +'%Y%m%d')" >> $FORGEJO_OUTPUT
@@ -50,13 +62,13 @@ jobs:
       - name: Log into Forgejo Container Registry
         if: github.event_name != 'pull_request'
         run: |
-          buildah login -u ${{ github.actor }} -p ${{ secrets.PACKAGE_TOKEN }} ${{ env.REGISTRY }}
+          podman login -u ${{ github.actor }} -p ${{ secrets.PACKAGE_TOKEN }} ${{ env.REGISTRY }}
 
       - name: Build image with Buildah
         id: build-image
         run: |
           # Vi bygger med 'raw-img' lokalt
-          buildah bud \
+          podman build \
             --label "org.opencontainers.image.source=https://forge.pc-rytteren.dk/${{ github.repository }}" \
             -t raw-img .
 
@@ -69,8 +81,8 @@ jobs:
         run: |
           for tag in $(echo "${{ steps.meta.outputs.tags }}"); do
             echo "Tagging and pushing: $tag"
-            buildah tag raw-img "$tag"
-            buildah push "$tag"
+            podman tag raw-img "$tag"
+            podman push "$tag"
           done
 
       - name: Install cosign