diff --git a/.github/workflows/conda_and_docs_build.yml b/.github/workflows/conda_and_docs_build.yml
index 50c12f4ee2..0c90faf472 100644
--- a/.github/workflows/conda_and_docs_build.yml
+++ b/.github/workflows/conda_and_docs_build.yml
@@ -117,7 +117,7 @@ jobs:
     - uses: docker/metadata-action@v5
       id: meta
       with:
-        images: tomographicimaging/cil
+        images: ghcr.io/${{ github.repository }}
         tags: |
           type=ref,event=branch
           type=ref,event=pr
@@ -126,8 +126,8 @@ jobs:
     - name: Get tag
       id: build-args
       run: |
-        if ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }}; then
-          echo "args=CIL_TAG=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+        if ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }}; then
+          echo "args=CIL_TAG=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
         else
           echo "args=" >> $GITHUB_OUTPUT
         fi