diff --git a/.github/workflows/.github-ci.yaml b/.github/workflows/.github-ci.yaml
index 7304c5d..c4aef4a 100644
--- a/.github/workflows/.github-ci.yaml
+++ b/.github/workflows/.github-ci.yaml
@@ -1,37 +1,53 @@
 name: ci
 
-on: push
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
-  docker:
-    runs-on: docker
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
+  build:
+    runs-on: ubuntu-22.04
 
-      - name: Repository meta
+    steps:
+      -
+        name: Repository meta
         id: repository
         run: |
           registry=${{ github.server_url }}
           registry=${registry##http*://}
           echo "registry=${registry}" >> "$GITHUB_OUTPUT"
+          echo "registry=${registry}"
           repository="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')"
           echo "repository=${repository}" >> "$GITHUB_OUTPUT"
-
-      - name: Docker meta
+          echo "repository=${repository}"
+      -
+        name: Docker meta
         uses: docker/metadata-action@v5
         id: docker
         with:
           images: ${{ steps.repository.outputs.registry }}/${{ steps.repository.outputs.repository }}
-
-      - name: Build and push
-        uses: https://codeberg.org/umglurf/kaniko-action@main
+      -
+        name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ steps.repository.outputs.registry }}
+          username: "${{ secrets.PACKAGES_USER }}"
+          password: "${{ secrets.PACKAGES_TOKEN }}"
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: '--allow-insecure-entitlement network.host'
+          driver-opts: network=host
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
         with:
-          credentials: |
-            ${{ steps.repository.outputs.registry }}=${{ github.repository }}:${{ secrets.PACKAGES_TOKEN }}            
-          destinations: |
-            ${{ steps.docker.outputs.tags }}
           push: true
+          allow: network.host
+          network: host
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.docker.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
index 45ea65f..4280220 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ COPY ./ ./
 
 # RUN go mod download
 
+RUN echo jojo
 RUN CGO_ENABLED=0 GOOS=linux go build -o fibonacci-go cmd/main.go
 
 # ToDo: use stretch as image for a completly empty container