diff --git a/.zuul.yaml b/.zuul.yaml
index 53d8d7bb0..225a08ad4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -161,6 +161,7 @@
     voting: false
     timeout: 9600
     pre-run:
+      - tools/gate/playbooks/resolvconf-config.yaml
       - tools/gate/playbooks/git-config.yaml
       - tools/gate/playbooks/airskiff-reduce-site.yaml
     run: tools/gate/playbooks/airskiff-deploy-gate.yaml
@@ -182,6 +183,7 @@
     voting: false
     timeout: 9600
     pre-run:
+      - tools/gate/playbooks/resolvconf-config.yaml
       - tools/gate/playbooks/git-config.yaml
       - tools/gate/playbooks/airskiff-reduce-site.yaml
     run: tools/gate/playbooks/airskiff-deploy-gate.yaml
diff --git a/tools/deployment/airskiff/developer/010-deploy-k8s.sh b/tools/deployment/airskiff/developer/010-deploy-k8s.sh
index e8e90a2d5..8ddefb690 100755
--- a/tools/deployment/airskiff/developer/010-deploy-k8s.sh
+++ b/tools/deployment/airskiff/developer/010-deploy-k8s.sh
@@ -40,4 +40,6 @@ if echo $(groups) | grep -qv 'docker'; then
 fi
 END_SCRIPT
 
+cat /etc/resolv.conf
+
 cd "${CURRENT_DIR}"
diff --git a/tools/gate/playbooks/resolvconf-config.yaml b/tools/gate/playbooks/resolvconf-config.yaml
new file mode 100644
index 000000000..ec01293ed
--- /dev/null
+++ b/tools/gate/playbooks/resolvconf-config.yaml
@@ -0,0 +1,23 @@
+# Copyright 2019, AT&T Intellectual Property
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- hosts: ubuntu-bionic
+  tasks:
+    - name: Remove localhost from resolv.conf
+      shell: |
+        set -xe;
+        sed -i '/127.0.0.1/d' /etc/resolv.conf
+      args:
+        chdir: "{{ zuul.project.src_dir }}"
+      become: yes