diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38614e657e..67af43f8f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,11 @@ commands:
       - run:
           name: "Configure Google DNS"
           command: |
-            echo "nameserver 8.8.8.8" | sudo tee /etc/resolv.conf
+            # Backup original resolv.conf
+            sudo cp /etc/resolv.conf /etc/resolv.conf.backup
+            # Add both local and Google DNS servers
+            echo "nameserver 127.0.0.11" | sudo tee /etc/resolv.conf
+            echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
             echo "nameserver 8.8.4.4" | sudo tee -a /etc/resolv.conf
 
 jobs:
@@ -242,6 +246,7 @@ jobs:
 
     steps:
       - checkout
+      - setup_google_dns
       - run:
           name: Show git commit hash
           command: |