diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 787fcb7..c0c7d93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -121,7 +121,7 @@ jobs:
         run: |
           source ./.bin/_bash.inc
           export entry=${{matrix.image}}
-          export image=toolisticon/${entry}-builder
+          export image=toolisticon/$(echo $entry | cut -d'/' -f2)-builder
 
           docker tag ${image}:${IMAGE_TAG} ${image}:${MAJOR_DOCKER_TAG}
           docker tag ${image}:${IMAGE_TAG} ${image}:${MINOR_DOCKER_TAG}
@@ -135,7 +135,7 @@ jobs:
         run: |
           source ./.bin/_bash.inc
           export entry=${{matrix.image}}
-          export image=toolisticon/${entry}-builder
+          export image=toolisticon/$(echo $entry | cut -d'/' -f2)-builder
 
           timeStamp=$(date +%s)
           docker tag ${image}:${IMAGE_TAG} ${image}:${timeStamp}