diff --git a/.dockerignore b/.dockerignore
index c787953..e4cf00d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 Dockerrun.aws.json
-./Makefile
 ./.gitignore
 ./.github/
 ./.git/
diff --git a/.github/workflows/build-push-ci.yml b/.github/workflows/build-push-ci.yml
index 59dc6ec..61344e8 100644
--- a/.github/workflows/build-push-ci.yml
+++ b/.github/workflows/build-push-ci.yml
@@ -35,5 +35,5 @@ jobs:
           context: .
           push: true
           tags: |
-            georgeogeorge/fastapi-test:${{ env.DOCKER_IMAGE_VERSION }}
-            georgeogeorge/fastapi-test:latest
+            ${{ secrets.DOCKER_HUB_USERNAME }}/fastapi-test:${{ env.DOCKER_IMAGE_VERSION }}
+            ${{ secrets.DOCKER_HUB_USERNAME }}/fastapi-test:latest
diff --git a/Makefile b/Makefile
index d93dd21..3eaead2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,4 @@ test:
 	pytest
 
 get-image-version:
-	echo "DOCKER_IMAGE_VERSION=$(git describe --tags --always)" >> $GITHUB_ENV
+	echo "DOCKER_IMAGE_VERSION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV