diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
index 27b4ad3..604730f 100644
--- a/.github/workflows/test-and-publish.yml
+++ b/.github/workflows/test-and-publish.yml
@@ -2,6 +2,8 @@ name: Test and Publish
 
 on:
   push:
+    branches: ['main'] #Triger on the develop branch
+    tags: [ '[0-9]+.[0-9]+.[0-9]+' ]  # Trigger on version tags like '0.1.0'
 
 jobs:
   tests:
@@ -22,26 +24,38 @@ jobs:
         run: docker compose run ssp-sp1.local ./run-metadata-tests.sh
 
   build-and-publish:
-    name: Build and Publish
+    name: Build and Publish Docker image
     needs: tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+              registry: ghcr.io
+              username: ${{ github.actor }}
+              password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ vars.DOCKER_ORG }}/${{ github.event.repository.name }}
+          images: |
+            ${{ vars.DOCKER_ORG }}/${{ github.event.repository.name }}
+            ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
+            
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with: