diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 2c634b4..df55a48 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -148,39 +148,39 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install skopeo
-        run: sudo apt-get update && sudo apt-get install -y skopeo
+      - name: Install buildah
+        run: sudo apt-get update && sudo apt-get install -y buildah
 
       - name: Build & push mcpd
         run: |
-          docker build -t mcpd:latest -f deploy/Dockerfile.mcpd .
-          skopeo copy --dest-tls-verify=false \
-            --dest-creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
-            docker-daemon:mcpd:latest \
+          buildah bud -t mcpd:latest -f deploy/Dockerfile.mcpd .
+          buildah push --tls-verify=false \
+            --creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
+            mcpd:latest \
             docker://${{ env.REGISTRY }}/${{ env.OWNER }}/mcpd:latest
 
       - name: Build & push node-runner
         run: |
-          docker build -t node-runner:latest -f deploy/Dockerfile.node-runner .
-          skopeo copy --dest-tls-verify=false \
-            --dest-creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
-            docker-daemon:node-runner:latest \
+          buildah bud -t node-runner:latest -f deploy/Dockerfile.node-runner .
+          buildah push --tls-verify=false \
+            --creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
+            node-runner:latest \
             docker://${{ env.REGISTRY }}/${{ env.OWNER }}/mcpctl-node-runner:latest
 
       - name: Build & push python-runner
         run: |
-          docker build -t python-runner:latest -f deploy/Dockerfile.python-runner .
-          skopeo copy --dest-tls-verify=false \
-            --dest-creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
-            docker-daemon:python-runner:latest \
+          buildah bud -t python-runner:latest -f deploy/Dockerfile.python-runner .
+          buildah push --tls-verify=false \
+            --creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
+            python-runner:latest \
             docker://${{ env.REGISTRY }}/${{ env.OWNER }}/mcpctl-python-runner:latest
 
       - name: Build & push docmost-mcp
         run: |
-          docker build -t docmost-mcp:latest -f deploy/Dockerfile.docmost-mcp .
-          skopeo copy --dest-tls-verify=false \
-            --dest-creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
-            docker-daemon:docmost-mcp:latest \
+          buildah bud -t docmost-mcp:latest -f deploy/Dockerfile.docmost-mcp .
+          buildah push --tls-verify=false \
+            --creds "${{ env.OWNER }}:${{ secrets.PACKAGES_TOKEN }}" \
+            docmost-mcp:latest \
             docker://${{ env.REGISTRY }}/${{ env.OWNER }}/docmost-mcp:latest
 
       - name: Link packages to repository