diff --git a/.circleci/config.yml b/.circleci/config.yml
index c03e91c..5ac0830 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,21 +69,24 @@ jobs:
             - ./node_modules    
   build_docker_file : 
     docker:
-      - image: "circleci/node:12"
+      - image: circleci/golang:1.13-alpine
+        auth:
+          username: ahlemfahem1
+          password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
     steps:
       - checkout
       - restore_cache:
           key: yarn-cache{{ checksum "yarn.lock" }} 
       - run: yarn install
-      - run:
-          name: Install Docker client
-          command: |
-            set -x
-            VER="18.06.3-ce"
-            curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
-            tar -xz -C /tmp -f /tmp/docker-$VER.tgz
-            mv /tmp/docker/* /usr/bin
-      - run: yarn ci:docker                    
+      - setup_remote_docker:
+          version: 19.03.13
+          docker_layer_caching: true
+      # build and push Docker image
+      - run: |
+          TAG=0.1.$CIRCLE_BUILD_NUM
+          docker build -t ahlemfahem1/projectci:latest .
+          echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+          docker push ahlemfahem1/projectci:latest                  
 workflows:
   build:
     jobs: