diff --git a/hack/scripts-dev/Makefile b/hack/scripts-dev/Makefile
deleted file mode 100644
index 96af2f51a..000000000
--- a/hack/scripts-dev/Makefile
+++ /dev/null
@@ -1,499 +0,0 @@
-# run from repository root
-
-
-
-# Example:
-#   make build -f ./hack/scripts-dev/Makefile
-#   make clean -f ./hack/scripts-dev/Makefile
-#   make clean-docker -f ./hack/scripts-dev/Makefile
-#   make restart-docker -f ./hack/scripts-dev/Makefile
-#   make delete-docker-images -f ./hack/scripts-dev/Makefile
-
-.PHONY: build
-build:
-	GO_BUILD_FLAGS="-v" ./build
-	./bin/etcd --version
-	ETCDCTL_API=3 ./bin/etcdctl version
-
-clean:
-	rm -f ./codecov
-	rm -rf ./agent-*
-	rm -rf ./covdir
-	rm -f ./*.log
-	rm -f ./bin/Dockerfile-release
-	rm -rf ./bin/*.etcd
-	rm -rf ./gopath
-	rm -rf ./release
-	rm -f ./integration/127.0.0.1:* ./integration/localhost:*
-	rm -f ./clientv3/integration/127.0.0.1:* ./clientv3/integration/localhost:*
-	rm -f ./clientv3/ordering/127.0.0.1:* ./clientv3/ordering/localhost:*
-
-clean-docker:
-	docker images
-	docker image prune --force
-
-restart-docker:
-	service docker restart
-
-delete-docker-images:
-	docker rm --force `docker ps -a -q` || true
-	docker rmi --force `docker images -q` || true
-
-
-
-GO_VERSION ?= 1.10.1
-ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
-
-TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
-TEST_OPTS ?= PASSES='unit'
-
-TMP_DIR_MOUNT_FLAG = --mount type=tmpfs,destination=/tmp
-ifdef HOST_TMP_DIR
-	TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination=/tmp
-endif
-
-
-
-# Example:
-#   GO_VERSION=1.8.7 make build-docker-test -f ./hack/scripts-dev/Makefile
-#   make build-docker-test -f ./hack/scripts-dev/Makefile
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
-#   GO_VERSION=1.8.7 make push-docker-test -f ./hack/scripts-dev/Makefile
-#   make push-docker-test -f ./hack/scripts-dev/Makefile
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   GO_VERSION=1.8.7 make pull-docker-test -f ./hack/scripts-dev/Makefile
-#   make pull-docker-test -f ./hack/scripts-dev/Makefile
-
-build-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-test
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  --file ./Dockerfile-test .
-	@mv ./Dockerfile-test.bak ./Dockerfile-test
-
-push-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd-test:go$(GO_VERSION)
-
-pull-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-test:go$(GO_VERSION)
-
-
-
-# Example:
-#   make build-docker-test -f ./hack/scripts-dev/Makefile
-#   make compile-with-docker-test -f ./hack/scripts-dev/Makefile
-#   make compile-setup-gopath-with-docker-test -f ./hack/scripts-dev/Makefile
-
-compile-with-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker run \
-	  --rm \
-	  --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "GO_BUILD_FLAGS=-v ./build && ./bin/etcd --version"
-
-compile-setup-gopath-with-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker run \
-	  --rm \
-	  --mount type=bind,source=`pwd`,destination=/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && ETCD_SETUP_GOPATH=1 GO_BUILD_FLAGS=-v ./build && ./bin/etcd --version && rm -rf ./gopath"
-
-
-
-# Example:
-#
-# Local machine:
-#   TEST_OPTS="PASSES='fmt'" make test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="PASSES='fmt bom dep compile build unit'" make test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="PASSES='build unit release integration_e2e functional'" make test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="PASSES='build grpcproxy'" make test -f ./hack/scripts-dev/Makefile
-#
-# Example (test with docker):
-#   make pull-docker-test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="PASSES='fmt'" make docker-test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="VERBOSE=2 PASSES='unit'" make docker-test -f ./hack/scripts-dev/Makefile
-#
-# Travis CI (test with docker):
-#   TEST_OPTS="PASSES='fmt bom dep compile build unit'" make docker-test -f ./hack/scripts-dev/Makefile
-#
-# Semaphore CI (test with docker):
-#   TEST_OPTS="PASSES='build unit release integration_e2e functional'" make docker-test -f ./hack/scripts-dev/Makefile
-#   HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build unit release integration_e2e functional'" make docker-test -f ./hack/scripts-dev/Makefile
-#   TEST_OPTS="GOARCH=386 PASSES='build unit integration_e2e'" make docker-test -f ./hack/scripts-dev/Makefile
-#
-# grpc-proxy tests (test with docker):
-#   TEST_OPTS="PASSES='build grpcproxy'" make docker-test -f ./hack/scripts-dev/Makefile
-#   HOST_TMP_DIR=/tmp TEST_OPTS="PASSES='build grpcproxy'" make docker-test -f ./hack/scripts-dev/Makefile
-
-.PHONY: test
-test:
-	$(info TEST_OPTS: $(TEST_OPTS))
-	$(info log-file: test-$(TEST_SUFFIX).log)
-	$(TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log
-	! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-$(TEST_SUFFIX).log
-
-docker-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	$(info TEST_OPTS: $(TEST_OPTS))
-	$(info log-file: test-$(TEST_SUFFIX).log)
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "$(TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log"
-	! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-$(TEST_SUFFIX).log
-
-docker-test-coverage:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	$(info log-file: docker-test-coverage-$(TEST_SUFFIX).log)
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \
-	  gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \
-	  /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1"
-	! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 docker-test-coverage-$(TEST_SUFFIX).log
-
-
-
-# Example:
-#   make compile-with-docker-test -f ./hack/scripts-dev/Makefile
-#   ETCD_VERSION=v3-test make build-docker-release-master -f ./hack/scripts-dev/Makefile
-#   ETCD_VERSION=v3-test make push-docker-release-master -f ./hack/scripts-dev/Makefile
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-
-build-docker-release-master:
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	cp ./Dockerfile-release ./bin/Dockerfile-release
-	docker build \
-	  --tag gcr.io/etcd-development/etcd:$(ETCD_VERSION) \
-	  --file ./bin/Dockerfile-release \
-	  ./bin
-	rm -f ./bin/Dockerfile-release
-
-	docker run \
-	  --rm \
-	  gcr.io/etcd-development/etcd:$(ETCD_VERSION) \
-	  /bin/sh -c "/usr/local/bin/etcd --version && ETCDCTL_API=3 /usr/local/bin/etcdctl version"
-
-push-docker-release-master:
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd:$(ETCD_VERSION)
-
-
-
-# Example:
-#   make build-docker-test -f ./hack/scripts-dev/Makefile
-#   make compile-with-docker-test -f ./hack/scripts-dev/Makefile
-#   make build-docker-static-ip-test -f ./hack/scripts-dev/Makefile
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
-#   make push-docker-static-ip-test -f ./hack/scripts-dev/Makefile
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-static-ip-test -f ./hack/scripts-dev/Makefile
-#   make docker-static-ip-test-certs-run -f ./hack/scripts-dev/Makefile
-#   make docker-static-ip-test-certs-metrics-proxy-run -f ./hack/scripts-dev/Makefile
-
-build-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./hack/scripts-dev/docker-static-ip/Dockerfile
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  --file ./hack/scripts-dev/docker-static-ip/Dockerfile \
-	  ./hack/scripts-dev/docker-static-ip
-	@mv ./hack/scripts-dev/docker-static-ip/Dockerfile.bak ./hack/scripts-dev/docker-static-ip/Dockerfile
-
-push-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
-
-pull-docker-static-ip-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION)
-
-docker-static-ip-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-static-ip/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-static-ip-test-certs-metrics-proxy-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \
-	  gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-metrics-proxy/run.sh && rm -rf m*.etcd"
-
-
-
-# Example:
-#   make build-docker-test -f ./hack/scripts-dev/Makefile
-#   make compile-with-docker-test -f ./hack/scripts-dev/Makefile
-#   make build-docker-dns-test -f ./hack/scripts-dev/Makefile
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
-#   make push-docker-dns-test -f ./hack/scripts-dev/Makefile
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-dns-test -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-insecure-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-certs-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-certs-gateway-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-certs-wildcard-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-certs-common-name-auth-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-test-certs-common-name-multi-run -f ./hack/scripts-dev/Makefile
-
-build-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./hack/scripts-dev/docker-dns/Dockerfile
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  --file ./hack/scripts-dev/docker-dns/Dockerfile \
-	  ./hack/scripts-dev/docker-dns
-	@mv ./hack/scripts-dev/docker-dns/Dockerfile.bak ./hack/scripts-dev/docker-dns/Dockerfile
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig etcd.local"
-
-push-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
-
-pull-docker-dns-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION)
-
-docker-dns-test-insecure-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/insecure,destination=/insecure \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /insecure/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-gateway-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/certs-gateway,destination=/certs-gateway \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-wildcard-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/certs-wildcard,destination=/certs-wildcard \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-common-name-auth-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-common-name-auth/run.sh && rm -rf m*.etcd"
-
-docker-dns-test-certs-common-name-multi-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \
-	  gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-common-name-multi/run.sh && rm -rf m*.etcd"
-
-
-
-# Example:
-#   make build-docker-test -f ./hack/scripts-dev/Makefile
-#   make compile-with-docker-test -f ./hack/scripts-dev/Makefile
-#   make build-docker-dns-srv-test -f ./hack/scripts-dev/Makefile
-#   gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
-#   make push-docker-dns-srv-test -f ./hack/scripts-dev/Makefile
-#   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
-#   make pull-docker-dns-srv-test -f ./hack/scripts-dev/Makefile
-#   make docker-dns-srv-test-certs-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-srv-test-certs-gateway-run -f ./hack/scripts-dev/Makefile
-#   make docker-dns-srv-test-certs-wildcard-run -f ./hack/scripts-dev/Makefile
-
-build-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./hack/scripts-dev/docker-dns-srv/Dockerfile
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  --file ./hack/scripts-dev/docker-dns-srv/Dockerfile \
-	  ./hack/scripts-dev/docker-dns-srv
-	@mv ./hack/scripts-dev/docker-dns-srv/Dockerfile.bak ./hack/scripts-dev/docker-dns-srv/Dockerfile
-
-	docker run \
-	  --rm \
-	  --dns 127.0.0.1 \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig +noall +answer SRV _etcd-client-ssl._tcp.etcd.local && dig +noall +answer SRV _etcd-server-ssl._tcp.etcd.local && dig +noall +answer m1.etcd.local m2.etcd.local m3.etcd.local"
-
-push-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
-
-pull-docker-dns-srv-test:
-	$(info GO_VERSION: $(GO_VERSION))
-	docker pull gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION)
-
-docker-dns-srv-test-certs-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns-srv/certs,destination=/certs \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd"
-
-docker-dns-srv-test-certs-gateway-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns-srv/certs-gateway,destination=/certs-gateway \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd"
-
-docker-dns-srv-test-certs-wildcard-run:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info HOST_TMP_DIR: $(HOST_TMP_DIR))
-	$(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG))
-	docker run \
-	  --rm \
-	  --tty \
-	  --dns 127.0.0.1 \
-	  $(TMP_DIR_MOUNT_FLAG) \
-	  --mount type=bind,source=`pwd`/bin,destination=/etcd \
-	  --mount type=bind,source=`pwd`/hack/scripts-dev/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \
-	  gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \
-	  /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd"
-
-
-
-# Example:
-#   make build-etcd-test-proxy -f ./hack/scripts-dev/Makefile
-
-build-etcd-test-proxy:
-	go build -v -o ./bin/etcd-test-proxy ./tools/etcd-test-proxy
-
-
-
-# Example:
-#   make build-docker-functional-tester -f ./hack/scripts-dev/Makefile
-#   make push-docker-functional-tester -f ./hack/scripts-dev/Makefile
-#   make pull-docker-functional-tester -f ./hack/scripts-dev/Makefile
-
-build-docker-functional-tester:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	@sed -i.bak 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./Dockerfile-functional-tester
-	docker build \
-	  --tag gcr.io/etcd-development/etcd-functional-tester:go$(GO_VERSION) \
-	  --file ./Dockerfile-functional-tester \
-	  .
-	@mv ./Dockerfile-functional-tester.bak ./Dockerfile-functional-tester
-
-	docker run \
-	  --rm \
-	  gcr.io/etcd-development/etcd-functional-tester:go$(GO_VERSION) \
-	  /bin/bash -c "./bin/etcd --version && \
-	   ./bin/etcd-failpoints --version && \
-	   ETCDCTL_API=3 ./bin/etcdctl version && \
-	   ./bin/etcd-agent -help || true && \
-	   ./bin/etcd-tester -help || true && \
-	   ./bin/etcd-runner --help || true && \
-	   ./bin/benchmark --help || true && \
-	   ./bin/etcd-test-proxy -help || true"
-
-push-docker-functional-tester:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	gcloud docker -- push gcr.io/etcd-development/etcd-functional-tester:go$(GO_VERSION)
-
-pull-docker-functional-tester:
-	$(info GO_VERSION: $(GO_VERSION))
-	$(info ETCD_VERSION: $(ETCD_VERSION))
-	docker pull gcr.io/etcd-development/etcd-functional-tester:go$(GO_VERSION)
diff --git a/hack/scripts-dev/README b/scripts/README
similarity index 100%
rename from hack/scripts-dev/README
rename to scripts/README
diff --git a/hack/scripts-dev/docker-dns-srv/Dockerfile b/scripts/docker-dns-srv/Dockerfile
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/Dockerfile
rename to scripts/docker-dns-srv/Dockerfile
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/Procfile b/scripts/docker-dns-srv/certs-gateway/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/Procfile
rename to scripts/docker-dns-srv/certs-gateway/Procfile
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/ca-csr.json b/scripts/docker-dns-srv/certs-gateway/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/ca-csr.json
rename to scripts/docker-dns-srv/certs-gateway/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/ca.crt b/scripts/docker-dns-srv/certs-gateway/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/ca.crt
rename to scripts/docker-dns-srv/certs-gateway/ca.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/gencert.json b/scripts/docker-dns-srv/certs-gateway/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/gencert.json
rename to scripts/docker-dns-srv/certs-gateway/gencert.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/gencerts.sh b/scripts/docker-dns-srv/certs-gateway/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/gencerts.sh
rename to scripts/docker-dns-srv/certs-gateway/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/run.sh b/scripts/docker-dns-srv/certs-gateway/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/run.sh
rename to scripts/docker-dns-srv/certs-gateway/run.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/server-ca-csr.json b/scripts/docker-dns-srv/certs-gateway/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/server-ca-csr.json
rename to scripts/docker-dns-srv/certs-gateway/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/server.crt b/scripts/docker-dns-srv/certs-gateway/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/server.crt
rename to scripts/docker-dns-srv/certs-gateway/server.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs-gateway/server.key.insecure b/scripts/docker-dns-srv/certs-gateway/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-gateway/server.key.insecure
rename to scripts/docker-dns-srv/certs-gateway/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/Procfile b/scripts/docker-dns-srv/certs-wildcard/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/Procfile
rename to scripts/docker-dns-srv/certs-wildcard/Procfile
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/ca-csr.json b/scripts/docker-dns-srv/certs-wildcard/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/ca-csr.json
rename to scripts/docker-dns-srv/certs-wildcard/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/ca.crt b/scripts/docker-dns-srv/certs-wildcard/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/ca.crt
rename to scripts/docker-dns-srv/certs-wildcard/ca.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/gencert.json b/scripts/docker-dns-srv/certs-wildcard/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/gencert.json
rename to scripts/docker-dns-srv/certs-wildcard/gencert.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/gencerts.sh b/scripts/docker-dns-srv/certs-wildcard/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/gencerts.sh
rename to scripts/docker-dns-srv/certs-wildcard/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/run.sh b/scripts/docker-dns-srv/certs-wildcard/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/run.sh
rename to scripts/docker-dns-srv/certs-wildcard/run.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/server-ca-csr.json b/scripts/docker-dns-srv/certs-wildcard/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/server-ca-csr.json
rename to scripts/docker-dns-srv/certs-wildcard/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/server.crt b/scripts/docker-dns-srv/certs-wildcard/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/server.crt
rename to scripts/docker-dns-srv/certs-wildcard/server.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs-wildcard/server.key.insecure b/scripts/docker-dns-srv/certs-wildcard/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs-wildcard/server.key.insecure
rename to scripts/docker-dns-srv/certs-wildcard/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns-srv/certs/Procfile b/scripts/docker-dns-srv/certs/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/Procfile
rename to scripts/docker-dns-srv/certs/Procfile
diff --git a/hack/scripts-dev/docker-dns-srv/certs/ca-csr.json b/scripts/docker-dns-srv/certs/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/ca-csr.json
rename to scripts/docker-dns-srv/certs/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs/ca.crt b/scripts/docker-dns-srv/certs/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/ca.crt
rename to scripts/docker-dns-srv/certs/ca.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs/gencert.json b/scripts/docker-dns-srv/certs/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/gencert.json
rename to scripts/docker-dns-srv/certs/gencert.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs/gencerts.sh b/scripts/docker-dns-srv/certs/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/gencerts.sh
rename to scripts/docker-dns-srv/certs/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs/run.sh b/scripts/docker-dns-srv/certs/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/run.sh
rename to scripts/docker-dns-srv/certs/run.sh
diff --git a/hack/scripts-dev/docker-dns-srv/certs/server-ca-csr.json b/scripts/docker-dns-srv/certs/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/server-ca-csr.json
rename to scripts/docker-dns-srv/certs/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns-srv/certs/server.crt b/scripts/docker-dns-srv/certs/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/server.crt
rename to scripts/docker-dns-srv/certs/server.crt
diff --git a/hack/scripts-dev/docker-dns-srv/certs/server.key.insecure b/scripts/docker-dns-srv/certs/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/certs/server.key.insecure
rename to scripts/docker-dns-srv/certs/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns-srv/etcd.zone b/scripts/docker-dns-srv/etcd.zone
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/etcd.zone
rename to scripts/docker-dns-srv/etcd.zone
diff --git a/hack/scripts-dev/docker-dns-srv/named.conf b/scripts/docker-dns-srv/named.conf
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/named.conf
rename to scripts/docker-dns-srv/named.conf
diff --git a/hack/scripts-dev/docker-dns-srv/rdns.zone b/scripts/docker-dns-srv/rdns.zone
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/rdns.zone
rename to scripts/docker-dns-srv/rdns.zone
diff --git a/hack/scripts-dev/docker-dns-srv/resolv.conf b/scripts/docker-dns-srv/resolv.conf
similarity index 100%
rename from hack/scripts-dev/docker-dns-srv/resolv.conf
rename to scripts/docker-dns-srv/resolv.conf
diff --git a/hack/scripts-dev/docker-dns/Dockerfile b/scripts/docker-dns/Dockerfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/Dockerfile
rename to scripts/docker-dns/Dockerfile
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/Procfile b/scripts/docker-dns/certs-common-name-auth/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/Procfile
rename to scripts/docker-dns/certs-common-name-auth/Procfile
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/ca-csr.json b/scripts/docker-dns/certs-common-name-auth/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/ca-csr.json
rename to scripts/docker-dns/certs-common-name-auth/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/ca.crt b/scripts/docker-dns/certs-common-name-auth/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/ca.crt
rename to scripts/docker-dns/certs-common-name-auth/ca.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/gencert.json b/scripts/docker-dns/certs-common-name-auth/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/gencert.json
rename to scripts/docker-dns/certs-common-name-auth/gencert.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/gencerts.sh b/scripts/docker-dns/certs-common-name-auth/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/gencerts.sh
rename to scripts/docker-dns/certs-common-name-auth/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/run.sh b/scripts/docker-dns/certs-common-name-auth/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/run.sh
rename to scripts/docker-dns/certs-common-name-auth/run.sh
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/server-ca-csr.json b/scripts/docker-dns/certs-common-name-auth/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/server-ca-csr.json
rename to scripts/docker-dns/certs-common-name-auth/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/server.crt b/scripts/docker-dns/certs-common-name-auth/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/server.crt
rename to scripts/docker-dns/certs-common-name-auth/server.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-auth/server.key.insecure b/scripts/docker-dns/certs-common-name-auth/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-auth/server.key.insecure
rename to scripts/docker-dns/certs-common-name-auth/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/Procfile b/scripts/docker-dns/certs-common-name-multi/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/Procfile
rename to scripts/docker-dns/certs-common-name-multi/Procfile
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/ca-csr.json b/scripts/docker-dns/certs-common-name-multi/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/ca-csr.json
rename to scripts/docker-dns/certs-common-name-multi/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/ca.crt b/scripts/docker-dns/certs-common-name-multi/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/ca.crt
rename to scripts/docker-dns/certs-common-name-multi/ca.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/gencert.json b/scripts/docker-dns/certs-common-name-multi/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/gencert.json
rename to scripts/docker-dns/certs-common-name-multi/gencert.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/gencerts.sh b/scripts/docker-dns/certs-common-name-multi/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/gencerts.sh
rename to scripts/docker-dns/certs-common-name-multi/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/run.sh b/scripts/docker-dns/certs-common-name-multi/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/run.sh
rename to scripts/docker-dns/certs-common-name-multi/run.sh
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-1.crt b/scripts/docker-dns/certs-common-name-multi/server-1.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-1.crt
rename to scripts/docker-dns/certs-common-name-multi/server-1.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-1.key.insecure b/scripts/docker-dns/certs-common-name-multi/server-1.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-1.key.insecure
rename to scripts/docker-dns/certs-common-name-multi/server-1.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-2.crt b/scripts/docker-dns/certs-common-name-multi/server-2.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-2.crt
rename to scripts/docker-dns/certs-common-name-multi/server-2.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-2.key.insecure b/scripts/docker-dns/certs-common-name-multi/server-2.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-2.key.insecure
rename to scripts/docker-dns/certs-common-name-multi/server-2.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-3.crt b/scripts/docker-dns/certs-common-name-multi/server-3.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-3.crt
rename to scripts/docker-dns/certs-common-name-multi/server-3.crt
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-3.key.insecure b/scripts/docker-dns/certs-common-name-multi/server-3.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-3.key.insecure
rename to scripts/docker-dns/certs-common-name-multi/server-3.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-1.json b/scripts/docker-dns/certs-common-name-multi/server-ca-csr-1.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-1.json
rename to scripts/docker-dns/certs-common-name-multi/server-ca-csr-1.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-2.json b/scripts/docker-dns/certs-common-name-multi/server-ca-csr-2.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-2.json
rename to scripts/docker-dns/certs-common-name-multi/server-ca-csr-2.json
diff --git a/hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-3.json b/scripts/docker-dns/certs-common-name-multi/server-ca-csr-3.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-common-name-multi/server-ca-csr-3.json
rename to scripts/docker-dns/certs-common-name-multi/server-ca-csr-3.json
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/Procfile b/scripts/docker-dns/certs-gateway/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/Procfile
rename to scripts/docker-dns/certs-gateway/Procfile
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/ca-csr.json b/scripts/docker-dns/certs-gateway/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/ca-csr.json
rename to scripts/docker-dns/certs-gateway/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/ca.crt b/scripts/docker-dns/certs-gateway/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/ca.crt
rename to scripts/docker-dns/certs-gateway/ca.crt
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/gencert.json b/scripts/docker-dns/certs-gateway/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/gencert.json
rename to scripts/docker-dns/certs-gateway/gencert.json
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/gencerts.sh b/scripts/docker-dns/certs-gateway/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/gencerts.sh
rename to scripts/docker-dns/certs-gateway/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/run.sh b/scripts/docker-dns/certs-gateway/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/run.sh
rename to scripts/docker-dns/certs-gateway/run.sh
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/server-ca-csr.json b/scripts/docker-dns/certs-gateway/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/server-ca-csr.json
rename to scripts/docker-dns/certs-gateway/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/server.crt b/scripts/docker-dns/certs-gateway/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/server.crt
rename to scripts/docker-dns/certs-gateway/server.crt
diff --git a/hack/scripts-dev/docker-dns/certs-gateway/server.key.insecure b/scripts/docker-dns/certs-gateway/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-gateway/server.key.insecure
rename to scripts/docker-dns/certs-gateway/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/Procfile b/scripts/docker-dns/certs-wildcard/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/Procfile
rename to scripts/docker-dns/certs-wildcard/Procfile
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/ca-csr.json b/scripts/docker-dns/certs-wildcard/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/ca-csr.json
rename to scripts/docker-dns/certs-wildcard/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/ca.crt b/scripts/docker-dns/certs-wildcard/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/ca.crt
rename to scripts/docker-dns/certs-wildcard/ca.crt
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/gencert.json b/scripts/docker-dns/certs-wildcard/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/gencert.json
rename to scripts/docker-dns/certs-wildcard/gencert.json
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/gencerts.sh b/scripts/docker-dns/certs-wildcard/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/gencerts.sh
rename to scripts/docker-dns/certs-wildcard/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/run.sh b/scripts/docker-dns/certs-wildcard/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/run.sh
rename to scripts/docker-dns/certs-wildcard/run.sh
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/server-ca-csr.json b/scripts/docker-dns/certs-wildcard/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/server-ca-csr.json
rename to scripts/docker-dns/certs-wildcard/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/server.crt b/scripts/docker-dns/certs-wildcard/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/server.crt
rename to scripts/docker-dns/certs-wildcard/server.crt
diff --git a/hack/scripts-dev/docker-dns/certs-wildcard/server.key.insecure b/scripts/docker-dns/certs-wildcard/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs-wildcard/server.key.insecure
rename to scripts/docker-dns/certs-wildcard/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns/certs/Procfile b/scripts/docker-dns/certs/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/Procfile
rename to scripts/docker-dns/certs/Procfile
diff --git a/hack/scripts-dev/docker-dns/certs/ca-csr.json b/scripts/docker-dns/certs/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/ca-csr.json
rename to scripts/docker-dns/certs/ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs/ca.crt b/scripts/docker-dns/certs/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/ca.crt
rename to scripts/docker-dns/certs/ca.crt
diff --git a/hack/scripts-dev/docker-dns/certs/gencert.json b/scripts/docker-dns/certs/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/gencert.json
rename to scripts/docker-dns/certs/gencert.json
diff --git a/hack/scripts-dev/docker-dns/certs/gencerts.sh b/scripts/docker-dns/certs/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/gencerts.sh
rename to scripts/docker-dns/certs/gencerts.sh
diff --git a/hack/scripts-dev/docker-dns/certs/run.sh b/scripts/docker-dns/certs/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/run.sh
rename to scripts/docker-dns/certs/run.sh
diff --git a/hack/scripts-dev/docker-dns/certs/server-ca-csr.json b/scripts/docker-dns/certs/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/server-ca-csr.json
rename to scripts/docker-dns/certs/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-dns/certs/server.crt b/scripts/docker-dns/certs/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/server.crt
rename to scripts/docker-dns/certs/server.crt
diff --git a/hack/scripts-dev/docker-dns/certs/server.key.insecure b/scripts/docker-dns/certs/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-dns/certs/server.key.insecure
rename to scripts/docker-dns/certs/server.key.insecure
diff --git a/hack/scripts-dev/docker-dns/etcd.zone b/scripts/docker-dns/etcd.zone
similarity index 100%
rename from hack/scripts-dev/docker-dns/etcd.zone
rename to scripts/docker-dns/etcd.zone
diff --git a/hack/scripts-dev/docker-dns/insecure/Procfile b/scripts/docker-dns/insecure/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-dns/insecure/Procfile
rename to scripts/docker-dns/insecure/Procfile
diff --git a/hack/scripts-dev/docker-dns/insecure/run.sh b/scripts/docker-dns/insecure/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-dns/insecure/run.sh
rename to scripts/docker-dns/insecure/run.sh
diff --git a/hack/scripts-dev/docker-dns/named.conf b/scripts/docker-dns/named.conf
similarity index 100%
rename from hack/scripts-dev/docker-dns/named.conf
rename to scripts/docker-dns/named.conf
diff --git a/hack/scripts-dev/docker-dns/rdns.zone b/scripts/docker-dns/rdns.zone
similarity index 100%
rename from hack/scripts-dev/docker-dns/rdns.zone
rename to scripts/docker-dns/rdns.zone
diff --git a/hack/scripts-dev/docker-dns/resolv.conf b/scripts/docker-dns/resolv.conf
similarity index 100%
rename from hack/scripts-dev/docker-dns/resolv.conf
rename to scripts/docker-dns/resolv.conf
diff --git a/hack/scripts-dev/docker-static-ip/Dockerfile b/scripts/docker-static-ip/Dockerfile
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/Dockerfile
rename to scripts/docker-static-ip/Dockerfile
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/Procfile b/scripts/docker-static-ip/certs-metrics-proxy/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/Procfile
rename to scripts/docker-static-ip/certs-metrics-proxy/Procfile
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/ca-csr.json b/scripts/docker-static-ip/certs-metrics-proxy/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/ca-csr.json
rename to scripts/docker-static-ip/certs-metrics-proxy/ca-csr.json
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/ca.crt b/scripts/docker-static-ip/certs-metrics-proxy/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/ca.crt
rename to scripts/docker-static-ip/certs-metrics-proxy/ca.crt
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/gencert.json b/scripts/docker-static-ip/certs-metrics-proxy/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/gencert.json
rename to scripts/docker-static-ip/certs-metrics-proxy/gencert.json
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/gencerts.sh b/scripts/docker-static-ip/certs-metrics-proxy/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/gencerts.sh
rename to scripts/docker-static-ip/certs-metrics-proxy/gencerts.sh
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/run.sh b/scripts/docker-static-ip/certs-metrics-proxy/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/run.sh
rename to scripts/docker-static-ip/certs-metrics-proxy/run.sh
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server-ca-csr.json b/scripts/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
rename to scripts/docker-static-ip/certs-metrics-proxy/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server.crt b/scripts/docker-static-ip/certs-metrics-proxy/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server.crt
rename to scripts/docker-static-ip/certs-metrics-proxy/server.crt
diff --git a/hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server.key.insecure b/scripts/docker-static-ip/certs-metrics-proxy/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs-metrics-proxy/server.key.insecure
rename to scripts/docker-static-ip/certs-metrics-proxy/server.key.insecure
diff --git a/hack/scripts-dev/docker-static-ip/certs/Procfile b/scripts/docker-static-ip/certs/Procfile
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/Procfile
rename to scripts/docker-static-ip/certs/Procfile
diff --git a/hack/scripts-dev/docker-static-ip/certs/ca-csr.json b/scripts/docker-static-ip/certs/ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/ca-csr.json
rename to scripts/docker-static-ip/certs/ca-csr.json
diff --git a/hack/scripts-dev/docker-static-ip/certs/ca.crt b/scripts/docker-static-ip/certs/ca.crt
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/ca.crt
rename to scripts/docker-static-ip/certs/ca.crt
diff --git a/hack/scripts-dev/docker-static-ip/certs/gencert.json b/scripts/docker-static-ip/certs/gencert.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/gencert.json
rename to scripts/docker-static-ip/certs/gencert.json
diff --git a/hack/scripts-dev/docker-static-ip/certs/gencerts.sh b/scripts/docker-static-ip/certs/gencerts.sh
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/gencerts.sh
rename to scripts/docker-static-ip/certs/gencerts.sh
diff --git a/hack/scripts-dev/docker-static-ip/certs/run.sh b/scripts/docker-static-ip/certs/run.sh
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/run.sh
rename to scripts/docker-static-ip/certs/run.sh
diff --git a/hack/scripts-dev/docker-static-ip/certs/server-ca-csr.json b/scripts/docker-static-ip/certs/server-ca-csr.json
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/server-ca-csr.json
rename to scripts/docker-static-ip/certs/server-ca-csr.json
diff --git a/hack/scripts-dev/docker-static-ip/certs/server.crt b/scripts/docker-static-ip/certs/server.crt
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/server.crt
rename to scripts/docker-static-ip/certs/server.crt
diff --git a/hack/scripts-dev/docker-static-ip/certs/server.key.insecure b/scripts/docker-static-ip/certs/server.key.insecure
similarity index 100%
rename from hack/scripts-dev/docker-static-ip/certs/server.key.insecure
rename to scripts/docker-static-ip/certs/server.key.insecure