diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 4d03f9a..97ca099 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -10,7 +10,7 @@ pipelines:
             name: Parallel Build and Test
             script:
               - IMAGE_NAME=$BITBUCKET_REPO_SLUG
-              - docker build . --file Dockerfile --tag gmgauthier/${IMAGE_NAME}
+              - docker build . --file Dockerfile --tag "gmgauthier/${IMAGE_NAME}:latest"
             services:
               - docker
             caches:
@@ -22,8 +22,7 @@ pipelines:
           name: Master Build and Test
           script:
             - IMAGE_NAME=$BITBUCKET_REPO_SLUG
-            - NAMESPACE="gmgauthier"
-            - docker build . --file Dockerfile --tag ${NAMESPACE}/${IMAGE_NAME}
+            - docker build . --file Dockerfile --tag "gmgauthier/${IMAGE_NAME}"
             - docker save ${IMAGE_NAME} --output "${IMAGE_NAME}.tar"
           services:
             - docker
@@ -37,7 +36,6 @@ pipelines:
           script:
             - echo ${DOCKERHUB_PASSWORD} | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
             - IMAGE_NAME=$BITBUCKET_REPO_SLUG
-            - NAMESPACE="gmgauthier"
-            - docker push ${NAMESPACE}/${IMAGE_NAME}:latest
+            - docker push "gmgauthier/${IMAGE_NAME}:latest"
           services:
             - docker