diff --git a/.github/workflows/build_container_image.yml b/.github/workflows/build_container_image.yml
index b6eddf4..179c2c0 100644
--- a/.github/workflows/build_container_image.yml
+++ b/.github/workflows/build_container_image.yml
@@ -21,6 +21,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build the Docker image with latest tag
         run: |
-          docker build . --file Dockerfiles/Dockerfile_backend --tag docker.io/simon-local/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/simon-local/${{ env.DOCKER_HUB_REPOSITORY }}:${{ steps.extract_branch.outputs.branch }} --tag docker.io/simon-local/${{ env.DOCKER_HUB_REPOSITORY }}:latest
-          docker build . --file Dockerfiles/Dockerfile_frontend --tag docker.io/simon-loacl/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:$GITHUB_SHA --tag docker.io/simon-local/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:${{ steps.extract_branch.outputs.branch }} --tag docker.io/simon-local/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:latest
+          docker build . --file Dockerfiles/Dockerfile_backend --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${{ steps.extract_branch.outputs.branch }} --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest
+          docker build . --file Dockerfiles/Dockerfile_frontend --tag docker.io/simon-loacl/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:${{ steps.extract_branch.outputs.branch }} --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}-nginx:latest
           echo docker api-explorer-ii with latest tag done