diff --git a/.github/workflows/build-mongo-tool.yml b/.github/workflows/build-mongo-tool.yml
index 6153cd3..ca080ea 100644
--- a/.github/workflows/build-mongo-tool.yml
+++ b/.github/workflows/build-mongo-tool.yml
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       VERSION: ""
+      DOCKER_REPOSITORY: ${{ vars.DOCKER_REPOSITORY || github.repository_owner }}
 
     steps:
       - uses: actions/checkout@v4
@@ -36,9 +37,9 @@ jobs:
       - name: Build Mongo Tool image
         uses: docker/build-push-action@v6
         with:
-          tags: maxisam/mongo-tool:${{ env.VERSION }}
+          tags: ${{ env.DOCKER_REPOSITORY }}/mongo-tool:${{ env.VERSION }}
           file: ./mongo-tool/Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64
-          cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/mongo-tool:buildcache-dev
-          cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/mongo-tool:buildcache-dev,mode=max
+          cache-from: type=registry,ref=${{ env.DOCKER_REPOSITORY }}/mongo-tool:buildcache-dev
+          cache-to: type=registry,ref=${{ env.DOCKER_REPOSITORY }}/mongo-tool:buildcache-dev,mode=max
diff --git a/mongo-tool/Dockerfile b/mongo-tool/Dockerfile
index f10a0d7..564ade4 100644
--- a/mongo-tool/Dockerfile
+++ b/mongo-tool/Dockerfile
@@ -1,4 +1,3 @@
-# Use a specific version of the Go Alpine image
 FROM golang:1.22.8-alpine3.20 AS builder
 
 # Build arguments