diff --git a/apicast/.s2i/bin/assemble b/apicast/.s2i/bin/assemble
deleted file mode 100755
index 4af365418..000000000
--- a/apicast/.s2i/bin/assemble
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-/usr/libexec/s2i/assemble
-
-chmod g+w /opt/app/http.d/resolver.conf
diff --git a/apicast/bin/entrypoint b/apicast/bin/entrypoint
index 6b15545c6..081dbe189 100755
--- a/apicast/bin/entrypoint
+++ b/apicast/bin/entrypoint
@@ -17,34 +17,6 @@ if [ "${AUTO_UPDATE_INTERVAL}" != 0 ] && [ "${AUTO_UPDATE_INTERVAL}" -lt 60 ]; t
   exit 1
 fi
 
-pick_dns_server() {
-  DNS=$(grep nameserver /etc/resolv.conf | awk {'print $2'})
-
-  if [ -z "$DNS" ]; then
-    echo "127.0.0.1"
-  else
-    for server in $DNS; do
-      if (nslookup -timeout=1 -retry=3 redhat.com "$server" &> /dev/null); then
-        echo "$server"
-	 exit 0
-      fi
-    done
-
-    (>&2 echo "error: no working DNS server found")
-    exit 1
-  fi
-}
-
-
-export NAMESERVER
-
-NAMESERVER=$(pick_dns_server)
-
-export RESOLVER=${RESOLVER:-${NAMESERVER}}
-
-mkdir -pv "$(pwd)/http.d"
-echo "resolver ${RESOLVER};" > "$(pwd)/http.d/resolver.conf"
-
 THREESCALE_PORTAL_ENDPOINT="${THREESCALE_PORTAL_ENDPOINT:-}"
 THREESCALE_CONFIG_FILE="${THREESCALE_CONFIG_FILE:-}"
 
diff --git a/apicast/http.d/resolver.conf b/apicast/http.d/resolver.conf
deleted file mode 100644
index f5b459919..000000000
--- a/apicast/http.d/resolver.conf
+++ /dev/null
@@ -1 +0,0 @@
-resolver 127.0.0.1 ipv6=off;