diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 65623e0..b335c44 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,7 +18,8 @@ jobs:
     env:
       TAG: v3
       DOCKERFILE: Dockerfile-parent
-      IMAGE: axelop/dart_package_analyzer
+      IMAGE: ghcr.io/${{ github.repository }}
+      REGISTRY: ghcr.io
 
     steps:
       - uses: actions/checkout@v4
@@ -31,7 +32,7 @@ jobs:
         uses: axel-op/docker-labels-retriever@master
         with:
           image: ${{ env.IMAGE }}:${{ env.TAG }}
-          registry: docker-hub
+          registry: ${{ env.REGISTRY }}
 
       - name: Check current image
         id: check
@@ -68,7 +69,16 @@ jobs:
 
       - name: Build new image
         if: steps.check.outputs.should_push == 'true'
-        run: sudo docker build --quiet --label "fluttersha=$CURRENT_FLUTTER" --label "panaversion=$CURRENT_PANA" --label "dartdigest=$CURRENT_DART" -f $DOCKERFILE -t $IMAGE:$TAG .
+        run: |
+          sudo docker build \
+            --quiet \
+            --label "fluttersha=$CURRENT_FLUTTER" \
+            --label "panaversion=$CURRENT_PANA" \
+            --label "dartdigest=$CURRENT_DART" \
+            --label "org.opencontainers.image.source=https://github.com/${{ github.repository }}" \
+            -f $DOCKERFILE \
+            -t $IMAGE:$TAG \
+            .
 
       - name: Test new image
         if: steps.check.outputs.should_push == 'true'
@@ -79,11 +89,13 @@ jobs:
           sudo docker exec test-container /bin/bash -c "cd /test && git init"
           sudo docker exec -e GITHUB_WORKSPACE=/test -e GITHUB_EVENT_PATH=/eventpayload -e GITHUB_SHA=$GITHUB_SHA -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY -e INPUT_MINANNOTATIONLEVEL=info -e INPUT_GITHUBTOKEN=${{ secrets.GITHUB_TOKEN }} test-container /bin/bash -c "/dart_package_analyzer"
 
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
       - name: Push new image
         if: steps.check.outputs.should_push == 'true'
-        env:
-          DOCKER_USERNAME: axelop
-          DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
-        run: |
-          echo $DOCKER_TOKEN | sudo docker login --username=$DOCKER_USERNAME --password-stdin
-          sudo docker push $IMAGE:$TAG
+        run: sudo docker push $IMAGE:$TAG