diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 595158e2..7024235f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,9 +5,6 @@ on:
     tags:
       - '*'
 
-env:
-  IMAGE_NAME: feature-server
-
 jobs:
   push:
 
@@ -21,7 +18,7 @@ jobs:
       - name: prepare tag 
         id: prepare_tag
         run: |
-            IMAGE_ID=jambonz/$IMAGE_NAME
+            IMAGE_ID=$GITHUB_REPOSITORY
 
             # Strip git ref prefix from version
             VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')