diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index c3515ee..684cb1d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -28,12 +28,17 @@ jobs:
 
         - name: Build Docker image
           run: |
-            docker build -t ghcr.io/${{ github.repository | toLowerCase}}/go-web-server:latest .
+            IMAGE_NAME="ghcr.io/${{ github.repository_owner }}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')/go-web-server:latest"
+            docker build -t "$IMAGE_NAME" .
+
+        - name: Build Docker image
+          run: |
+            docker build -t $IMAGE_NAME .
   
         - name: Push Docker image to GitHub Container Registry
           run: |
-            docker push ghcr.io/${{ github.repository | toLowerCase }}/go-web-server:latest
+            docker push $IMAGE_NAME
   
         - name: Verify image is pushed
           run: |
-            echo "Docker image pushed to: ghcr.io/${{ github.repository | toLowerCase }}/go-web-server:latest"
\ No newline at end of file
+            echo "Docker image pushed to: $IMAGE_NAME"
\ No newline at end of file