diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
index 4a8b64f92d..ff6cd33f97 100644
--- a/.github/workflows/docker-image-build.yml
+++ b/.github/workflows/docker-image-build.yml
@@ -19,6 +19,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      - name: Log in to the GitHub Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout Dockerfile for image building
         uses: actions/checkout@v4
         with:
@@ -66,7 +73,9 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: aandrisa/${{ matrix.kuiper_artifact }}:latest
           file: ci/Dockerfile
           context: .
           platforms: ${{ matrix.arch }}
+          tags: |
+            aandrisa/${{ matrix.kuiper_artifact }}:latest
+            ghcr.io/analogdevicesinc/adi-kuiper-gen/${{ matrix.kuiper_artifact }}:latest