diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 7e716bc..d6c61a5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,15 +15,15 @@ on:
   pull_request:
     branches: [ "main" ]
 
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
 
 jobs:
+
   build_mate:
+    env:
+      # Use docker.io for Docker Hub if empty
+      REGISTRY: ghcr.io
+      # github.repository as <account>/<repo>
+      IMAGE_NAME: containdesk-mate
 
     runs-on: ubuntu-latest
     permissions:
@@ -75,6 +75,11 @@ jobs:
           cache-to: type=gha,mode=max
 
   build_xfce:
+    env:
+      # Use docker.io for Docker Hub if empty
+      REGISTRY: ghcr.io
+      # github.repository as <account>/<repo>
+      IMAGE_NAME: containdesk-xfce
 
     runs-on: ubuntu-latest
     permissions: