diff --git a/.circleci/build-docker.sh b/.circleci/build-docker.sh
new file mode 100644
index 0000000..d414e64
--- /dev/null
+++ b/.circleci/build-docker.sh
@@ -0,0 +1,13 @@
+TAG=app
+IMAGE_NAME=$DOCKERHUB_LOGIN/$DOCKERHUB_REPOSITORY
+IMAGE_NAME_BUILDNUM=$IMAGE_NAME:${CIRCLE_BUILD_NUM}
+IMAGE_NAME_LATEST=$IMAGE_NAME:latest
+
+docker build -t $TAG .
+docker tag $TAG $IMAGE_NAME_BUILDNUM
+docker tag $TAG $IMAGE_NAME_LATEST
+
+echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_LOGIN --password-stdin
+
+docker push $IMAGE_NAME_BUILDNUM
+docker push $IMAGE_NAME_LATEST
diff --git a/.circleci/config.yml b/.circleci/config.yml
index abd02c6..53410c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,19 +111,10 @@ jobs:
       - run:
           name: Build and Push docker image
           command: |
-            TAG=app
-            IMAGE_NAME=anthonyjhoiro/my-awesome-ci-expr
-            IMAGE_NAME_BUILDNUM=$IMAGE_NAME:${CIRCLE_BUILD_NUM}
-            IMAGE_NAME_LATEST=$IMAGE_NAME:latest
-
-            docker build -t $TAG .
-            docker tag $TAG $IMAGE_NAME_BUILDNUM
-            docker tag $TAG $IMAGE_NAME_LATEST
-
-            echo $DOCKERHUB_PASSWORD | docker login -u anthonyjhoiro --password-stdin
-
-            docker push $IMAGE_NAME_BUILDNUM
-            docker push $IMAGE_NAME_LATEST
+            .circleci/build-docker.sh
+          environment:
+            DOCKERHUB_LOGIN: anthonyjhoiro
+            DOCKERHUB_REPOSITORY: my-awesome-ci-expr