diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b8e943c..8f564a5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -6,7 +6,7 @@ on:
       - gcc/*
 
 env:
-  IMAGE_NAME: ${{ github.repository_owner }}/caentainer-gcc
+  IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/caentainer-gcc
 
 jobs:
   push:
@@ -18,11 +18,25 @@ jobs:
       - uses: actions/checkout@v3
       - uses: docker/setup-buildx-action@v2
 
+      - name: Generate Image Tag
+        id: image-tag
+        run: |
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo VERSION=$VERSION
+
+          echo "::set-output name=TAG::${VERSION}"
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=${{ steps.image-tag.outputs.TAG }}
+            type=ref,event=branch
+            type=ref,event=tag
 
       - name: Log into GitHub Container Registry
         uses: docker/login-action@v2