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