diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index ad6e3e257ce2e28a8c9450a0dc66cd6b149c1277..622309591fadf1f1e13e2366106ac8d3ff0c5249 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: gluon-build
+  IMAGE_NAME: ${{ github.repository }}-build
 
 jobs:
   build-and-push-image:
@@ -36,7 +36,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3
         with:
-          images: ${{ env.REGISTRY }}/freifunk-gluon/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
         uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
         with: