diff --git a/.github/workflows/naoqi_humble_amd64_arm64.yml b/.github/workflows/naoqi_humble_amd64_arm64.yml
new file mode 100644
index 0000000..f3ac3c0
--- /dev/null
+++ b/.github/workflows/naoqi_humble_amd64_arm64.yml
@@ -0,0 +1,66 @@
+name: ROS Humble NAOQI AMD64/ARM64
+
+on:
+  workflow_dispatch:
+
+  push:
+    branches: 
+      - main
+    paths-ignore:
+      - README.md
+
+  pull_request:
+    branches: 
+      - main
+    paths-ignore:
+      - README.md
+
+env:
+  REGISTRY: ghcr.io
+  OWNER: airesearchlab
+  IMAGE_NAME: naoqi-ros
+
+# https://docs.github.com/en/actions/using-jobs/using-concurrency
+concurrency:
+  # only cancel in-progress jobs or runs for the current workflow - matches against branch & tags
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+  
+jobs:
+
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          
+      - name: Check out the repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        run: |
+          docker login --username ${{ env.OWNER }} --password ${{ secrets.GH_PAT }} ghcr.io 
+
+      - name: Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/Dockerfile
+          platforms: linux/amd64, linux/arm64
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.IMAGE_NAME }}:humble