diff --git a/.circleci/config.yml b/.circleci/config.yml
index f58a4f1fe..b2537cc40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,10 +34,9 @@ jobs:
       - checkout  
       - run:
           command: |
-            echo "117.18.232.200 api.nuget.org" | sudo tee -a /etc/hosts
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f Dockerfile.linuxamd64 .
+            sudo docker build --add-host "api.nuget.org:117.18.232.200" --pull -t $DOCKERHUB_REPO:$LATEST_TAG-amd64 -f Dockerfile.linuxamd64 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-amd64
 
@@ -48,11 +47,10 @@ jobs:
       - checkout  
       - run:
           command: |
-            echo "117.18.232.200 api.nuget.org" | sudo tee -a /etc/hosts
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
             LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f Dockerfile.linuxarm32v7 .
+            sudo docker build --add-host "api.nuget.org:117.18.232.200" --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f Dockerfile.linuxarm32v7 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
 
@@ -63,7 +61,6 @@ jobs:
     steps:
       - run:
           command: |
-            echo "117.18.232.200 api.nuget.org" | sudo tee -a /etc/hosts
             # Turn on Experimental features
             sudo mkdir $HOME/.docker
             sudo sh -c 'echo "{ \"experimental\": \"enabled\" }" >> $HOME/.docker/config.json'