diff --git a/Dockerfile-test b/Dockerfile-test
index 1ec32b8c8..8e0be6a3f 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -32,7 +32,7 @@ RUN apt-get -y update \
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
-ENV GO_VERSION 1.9.1
+ENV GO_VERSION REPLACE_ME_GO_VERSION
 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
 RUN rm -rf ${GOROOT} \
   && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \
diff --git a/e2e/docker-dns-srv/Dockerfile b/e2e/docker-dns-srv/Dockerfile
deleted file mode 100644
index 1eaf3c801..000000000
--- a/e2e/docker-dns-srv/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM golang:1.9.1-stretch
-LABEL Description="Image for etcd DNS SRV testing"
-
-RUN apt update -y \
-  && apt install -y -q \
-  bind9 \
-  dnsutils
-
-RUN mkdir -p /var/bind /etc/bind
-RUN chown root:bind /var/bind /etc/bind
-ADD Procfile /Procfile
-ADD run.sh /run.sh
-
-ADD named.conf etcd.zone rdns.zone /etc/bind/
-RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
-ADD resolv.conf /etc/resolv.conf
-
-RUN go get github.com/mattn/goreman
-CMD ["/run.sh"]
diff --git a/e2e/docker-dns/Dockerfile b/e2e/docker-dns/Dockerfile
deleted file mode 100644
index 45fbda685..000000000
--- a/e2e/docker-dns/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM golang:1.9.1-stretch
-LABEL Description="Image for etcd DNS testing"
-
-RUN apt update -y \
-  && apt install -y -q \
-  bind9 \
-  dnsutils
-
-RUN mkdir -p /var/bind /etc/bind
-RUN chown root:bind /var/bind /etc/bind
-ADD Procfile.tls /Procfile.tls
-ADD run.sh /run.sh
-
-ADD named.conf etcd.zone rdns.zone /etc/bind/
-RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
-ADD resolv.conf /etc/resolv.conf
-
-RUN go get github.com/mattn/goreman
-CMD ["/run.sh"]
\ No newline at end of file
diff --git a/hack/scripts-dev/docker-dns-srv/Dockerfile b/hack/scripts-dev/docker-dns-srv/Dockerfile
new file mode 100644
index 000000000..e53787e4f
--- /dev/null
+++ b/hack/scripts-dev/docker-dns-srv/Dockerfile
@@ -0,0 +1,48 @@
+FROM ubuntu:16.10
+
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN apt-get -y update \
+  && apt-get -y install \
+  build-essential \
+  gcc \
+  apt-utils \
+  pkg-config \
+  software-properties-common \
+  apt-transport-https \
+  libssl-dev \
+  sudo \
+  bash \
+  curl \
+  tar \
+  git \
+  netcat \
+  bind9 \
+  dnsutils \
+  && apt-get -y update \
+  && apt-get -y upgrade \
+  && apt-get -y autoremove \
+  && apt-get -y autoclean
+
+ENV GOROOT /usr/local/go
+ENV GOPATH /go
+ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
+ENV GO_VERSION REPLACE_ME_GO_VERSION
+ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
+RUN rm -rf ${GOROOT} \
+  && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \
+  && mkdir -p ${GOPATH}/src ${GOPATH}/bin \
+  && go version
+
+RUN mkdir -p /var/bind /etc/bind
+RUN chown root:bind /var/bind /etc/bind
+ADD Procfile /Procfile
+ADD run.sh /run.sh
+
+ADD named.conf etcd.zone rdns.zone /etc/bind/
+RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
+ADD resolv.conf /etc/resolv.conf
+
+RUN go get github.com/mattn/goreman
+CMD ["/run.sh"]
diff --git a/e2e/docker-dns-srv/Procfile b/hack/scripts-dev/docker-dns-srv/Procfile
similarity index 100%
rename from e2e/docker-dns-srv/Procfile
rename to hack/scripts-dev/docker-dns-srv/Procfile
diff --git a/e2e/docker-dns-srv/etcd.zone b/hack/scripts-dev/docker-dns-srv/etcd.zone
similarity index 100%
rename from e2e/docker-dns-srv/etcd.zone
rename to hack/scripts-dev/docker-dns-srv/etcd.zone
diff --git a/e2e/docker-dns-srv/named.conf b/hack/scripts-dev/docker-dns-srv/named.conf
similarity index 100%
rename from e2e/docker-dns-srv/named.conf
rename to hack/scripts-dev/docker-dns-srv/named.conf
diff --git a/e2e/docker-dns-srv/rdns.zone b/hack/scripts-dev/docker-dns-srv/rdns.zone
similarity index 100%
rename from e2e/docker-dns-srv/rdns.zone
rename to hack/scripts-dev/docker-dns-srv/rdns.zone
diff --git a/e2e/docker-dns-srv/resolv.conf b/hack/scripts-dev/docker-dns-srv/resolv.conf
similarity index 100%
rename from e2e/docker-dns-srv/resolv.conf
rename to hack/scripts-dev/docker-dns-srv/resolv.conf
diff --git a/e2e/docker-dns-srv/run.sh b/hack/scripts-dev/docker-dns-srv/run.sh
similarity index 100%
rename from e2e/docker-dns-srv/run.sh
rename to hack/scripts-dev/docker-dns-srv/run.sh
diff --git a/hack/scripts-dev/docker-dns/Dockerfile b/hack/scripts-dev/docker-dns/Dockerfile
new file mode 100644
index 000000000..7b8548d8e
--- /dev/null
+++ b/hack/scripts-dev/docker-dns/Dockerfile
@@ -0,0 +1,48 @@
+FROM ubuntu:16.10
+
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
+RUN apt-get -y update \
+  && apt-get -y install \
+  build-essential \
+  gcc \
+  apt-utils \
+  pkg-config \
+  software-properties-common \
+  apt-transport-https \
+  libssl-dev \
+  sudo \
+  bash \
+  curl \
+  tar \
+  git \
+  netcat \
+  bind9 \
+  dnsutils \
+  && apt-get -y update \
+  && apt-get -y upgrade \
+  && apt-get -y autoremove \
+  && apt-get -y autoclean
+
+ENV GOROOT /usr/local/go
+ENV GOPATH /go
+ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
+ENV GO_VERSION REPLACE_ME_GO_VERSION
+ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
+RUN rm -rf ${GOROOT} \
+  && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \
+  && mkdir -p ${GOPATH}/src ${GOPATH}/bin \
+  && go version
+
+RUN mkdir -p /var/bind /etc/bind
+RUN chown root:bind /var/bind /etc/bind
+ADD Procfile.tls /Procfile.tls
+ADD run.sh /run.sh
+
+ADD named.conf etcd.zone rdns.zone /etc/bind/
+RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone
+ADD resolv.conf /etc/resolv.conf
+
+RUN go get github.com/mattn/goreman
+CMD ["/run.sh"]
diff --git a/e2e/docker-dns/Procfile.tls b/hack/scripts-dev/docker-dns/Procfile.tls
similarity index 100%
rename from e2e/docker-dns/Procfile.tls
rename to hack/scripts-dev/docker-dns/Procfile.tls
diff --git a/e2e/docker-dns/etcd.zone b/hack/scripts-dev/docker-dns/etcd.zone
similarity index 100%
rename from e2e/docker-dns/etcd.zone
rename to hack/scripts-dev/docker-dns/etcd.zone
diff --git a/e2e/docker-dns/named.conf b/hack/scripts-dev/docker-dns/named.conf
similarity index 100%
rename from e2e/docker-dns/named.conf
rename to hack/scripts-dev/docker-dns/named.conf
diff --git a/e2e/docker-dns/rdns.zone b/hack/scripts-dev/docker-dns/rdns.zone
similarity index 100%
rename from e2e/docker-dns/rdns.zone
rename to hack/scripts-dev/docker-dns/rdns.zone
diff --git a/e2e/docker-dns/resolv.conf b/hack/scripts-dev/docker-dns/resolv.conf
similarity index 100%
rename from e2e/docker-dns/resolv.conf
rename to hack/scripts-dev/docker-dns/resolv.conf
diff --git a/e2e/docker-dns/run.sh b/hack/scripts-dev/docker-dns/run.sh
similarity index 100%
rename from e2e/docker-dns/run.sh
rename to hack/scripts-dev/docker-dns/run.sh