diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile
deleted file mode 100644
index f385160af5..0000000000
--- a/tools/images/ceph-config-helper/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM docker.io/ubuntu:xenial
-MAINTAINER pete.birley@att.com
-
-ARG KUBE_VERSION=v1.10.3
-ARG CEPH_RELEASE=mimic
-
-ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-key add /etc/apt/ceph-release.asc ;\
-    rm -f /etc/apt/ceph-release.asc ;\
-    echo deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
-    TMP_DIR=$(mktemp --directory) ;\
-    cd ${TMP_DIR} ;\
-    apt-get update ;\
-    apt-get dist-upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        apt-transport-https \
-        ca-certificates \
-        ceph \
-        curl \
-        gcc \
-        python \
-        python-dev \
-        jq ;\
-    curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\
-    pip --no-cache-dir install --upgrade \
-      crush \
-      rgwadmin \
-      six \
-      python-openstackclient \
-      python-swiftclient ;\
-    curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
-    mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\
-    chmod +x /usr/bin/kubectl ;\
-    rm -rf ${TMP_DIR} ;\
-    apt-get purge -y --auto-remove \
-        python-dev \
-        gcc ;\
-    rm -rf /var/lib/apt/lists/*
diff --git a/tools/images/ceph-config-helper/Makefile b/tools/images/ceph-config-helper/Makefile
deleted file mode 100644
index ced7cb3c5a..0000000000
--- a/tools/images/ceph-config-helper/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-# It's necessary to set this because some environments don't link sh -> bash.
-SHELL := /bin/bash
-
-DOCKER_REGISTRY            ?= docker.io
-IMAGE_NAME                 ?= ceph-config-helper
-IMAGE_PREFIX               ?= openstackhelm
-IMAGE_TAG                  ?= latest
-KUBE_VERSION               ?= v1.10.3
-LABEL                      ?= putlabelshere
-
-IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-
-# Build ceph-config-helper Docker image for this project
-.PHONY: images
-images: build_$(IMAGE_NAME)
-
-# Make targets intended for use by the primary targets above.
-.PHONY: build_$(IMAGE_NAME)
-build_$(IMAGE_NAME):
-	docker build \
-	--network host \
-	--build-arg KUBE_VERSION=$(KUBE_VERSION) \
-	-t $(IMAGE) \
-	--label $(LABEL) --label KUBE_VERSION=$(KUBE_VERSION) \
-	.
diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst
deleted file mode 100644
index f153be596a..0000000000
--- a/tools/images/ceph-config-helper/README.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-Ceph Config Helper Container
-============================
-
-This container builds a small image with kubectl and some other utilites for
-use in the ceph-config chart.
-
-Instructions
-------------
-
-OS Specific Host setup:
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Ubuntu:
-^^^^^^^
-
-From a freshly provisioned Ubuntu 16.04 LTS host run:
-
-.. code:: bash
-
-    sudo apt-get update -y
-    sudo apt-get install -y \
-            docker.io \
-            git
-
-Build the Ceph-Helper Image environment (optional)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A known good image is published to dockerhub on a fairly regular basis, but if
-you wish to build your own image, from the root directory of the OpenStack-Helm
-repo run:
-
-.. code:: bash
-
-    export KUBE_VERSION=v1.10.3
-    sudo docker build \
-      --network host \
-      --build-arg KUBE_VERSION=${KUBE_VERSION} \
-      -t docker.io/port/ceph-config-helper:${KUBE_VERSION} \
-      tools/images/ceph-config-helper
-    sudo docker push docker.io/port/ceph-config-helper:${KUBE_VERSION}
diff --git a/tools/images/gate-utils/Dockerfile b/tools/images/gate-utils/Dockerfile
deleted file mode 100644
index 25c16a9241..0000000000
--- a/tools/images/gate-utils/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM gcr.io/google-containers/debian-base-amd64:0.3
-
-RUN /usr/local/bin/clean-install ipcalc
diff --git a/tools/images/gate-utils/Makefile b/tools/images/gate-utils/Makefile
deleted file mode 100644
index 05ca55b066..0000000000
--- a/tools/images/gate-utils/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-# It's necessary to set this because some environments don't link sh -> bash.
-SHELL := /bin/bash
-
-DOCKER_REGISTRY            ?= docker.io
-IMAGE_NAME                 ?= gate-utils
-IMAGE_PREFIX               ?= openstackhelm
-IMAGE_TAG                  ?= v0.1.0
-LABEL                      ?= putlabelshere
-
-IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-
-# Build gate-utils Docker image for this project
-.PHONY: images
-images: build_$(IMAGE_NAME)
-
-# Make targets intended for use by the primary targets above.
-.PHONY: build_$(IMAGE_NAME)
-build_$(IMAGE_NAME):
-	docker build \
-	--label $(LABEL) \
-	-t $(IMAGE) \
-	.
diff --git a/tools/images/gate-utils/README.rst b/tools/images/gate-utils/README.rst
deleted file mode 100644
index 6cb65b91c0..0000000000
--- a/tools/images/gate-utils/README.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-Gate Utils Container
-====================
-
-This container builds a small image with ipcalc for use in both the multinode
-checks and development.
-
-Instructions
-------------
-
-OS Specific Host setup:
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Ubuntu:
-^^^^^^^
-
-From a freshly provisioned Ubuntu 16.04 LTS host run:
-
-.. code:: bash
-
-    sudo apt-get update -y
-    sudo apt-get install -y \
-            docker.io \
-            git
-
-Build the Gate Utils Image
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A known good image is published to dockerhub on a fairly regular basis, but if
-you wish to build your own image, from the root directory of the OpenStack-Helm
-repo run:
-
-.. code:: bash
-
-    sudo docker build \
-      -t docker.io/openstackhelm/gate-utils:v0.1.0 \
-      tools/images/gate-utils
-    sudo docker push docker.io/openstackhelm/gate-utils:v0.1.0
diff --git a/tools/images/kubernetes-entrypoint/.gitignore b/tools/images/kubernetes-entrypoint/.gitignore
deleted file mode 100644
index d1fdd0493f..0000000000
--- a/tools/images/kubernetes-entrypoint/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# kubernetes-entrypoint git clone target
-src
diff --git a/tools/images/kubernetes-entrypoint/Dockerfile b/tools/images/kubernetes-entrypoint/Dockerfile
deleted file mode 100644
index d4264a1ba6..0000000000
--- a/tools/images/kubernetes-entrypoint/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM docker.io/ubuntu:xenial
-
-ARG BINARY_PATH
-ARG BINARY_INSTALL_PATH=/usr/local/bin/kubernetes-entrypoint
-ENV BINARY_INSTALL_PATH=${BINARY_INSTALL_PATH}
-
-COPY ${BINARY_PATH} ${BINARY_INSTALL_PATH}
-
-CMD ${BINARY_INSTALL_PATH}
diff --git a/tools/images/kubernetes-entrypoint/Makefile b/tools/images/kubernetes-entrypoint/Makefile
deleted file mode 100644
index 7bf276945a..0000000000
--- a/tools/images/kubernetes-entrypoint/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.
-
-# It's necessary to set this because some environments don't link sh -> bash.
-SHELL := /bin/bash
-
-# Git args
-GIT_REPO                   ?= https://github.com/stackanetes/kubernetes-entrypoint.git
-GIT_REF                    ?= master
-_GIT_CLONE_SUBDIR          := src
-_GIT_CLONE_MOUNT_DIR       := /go/src/github.com/stackanetes/kubernetes-entrypoint
-
-# Image args
-IMAGE_REGISTRY             ?= docker.io
-IMAGE_NAME                 ?= kubernetes-entrypoint
-IMAGE_PREFIX               ?= openstackhelm
-IMAGE_TAG                  ?= $(GIT_REF)
-IMAGE_LABELS               ?=
-# Overrides above image args if specified.
-IMAGE                      ?= ${IMAGE_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}$(if $(IMAGE_TAG),:$(IMAGE_TAG),)
-IMAGE_DOCKER_BUILD_OPTS    ?=
-IMAGE_BINARY_INSTALL_PATH  ?=
-
-# Go args
-GO_IMAGE                   ?= docker.io/golang:1.10
-GO_BUILD_OPTS              ?=
-
-# Binary args
-_BINARY_SUBDIR             := out
-_BINARY_PATH               := $(_BINARY_SUBDIR)/kubernetes-entrypoint
-
-.PHONY: all
-all: clean checkout binary image push
-
-# Remove source code and binary
-.PHONY: clean
-clean:
-	rm -rf $(_GIT_CLONE_SUBDIR)
-
-# Checkout source code
-.PHONY: checkout
-checkout:
-	git clone $(GIT_REPO) $(_GIT_CLONE_SUBDIR)
-	cd $(_GIT_CLONE_SUBDIR); git checkout $(GIT_REF) .
-
-# Build binary
-.PHONY: binary
-binary:
-	docker run\
-  	-v "$(shell pwd)/$(_GIT_CLONE_SUBDIR)":$(_GIT_CLONE_MOUNT_DIR)\
-		`# Run as current user, not root, to avoid sudo usage in clean target`\
-		-v /etc/group:/etc/group:ro -v /etc/passwd:/etc/passwd:ro\
-		-u $(shell id -u ${USER}):$(shell id -g ${USER})\
-		-w $(_GIT_CLONE_MOUNT_DIR)\
-		$(GO_IMAGE)\
-		go build -o "$(_BINARY_PATH)" $(GO_BUILD_OPTS)
-
-# Internal variables
-_BINARY_INSTALL_PATH_ARG   := $(if $(IMAGE_BINARY_INSTALL_PATH),--build-arg BINARY_INSTALL_PATH="${IMAGE_BINARY_INSTALL_PATH}" ,)
-_IMAGE_LABELS_ARG          := $(if $(IMAGE_LABELS),--label="${IMAGE_LABELS}" ,)
-
-# Build image
-.PHONY: image
-image:
-	docker build\
-	  --build-arg BINARY_PATH=/$(_GIT_CLONE_SUBDIR)/$(_BINARY_PATH)\
-	  $(_BINARY_INSTALL_PATH_ARG)\
-	  $(_IMAGE_LABELS_ARG)\
-	  -t $(IMAGE)\
-	  $(IMAGE_DOCKER_BUILD_OPTS)\
-	  .
-
-# Push image
-.PHONY: push
-push:
-	docker push $(IMAGE)
diff --git a/tools/images/kubernetes-entrypoint/README.rst b/tools/images/kubernetes-entrypoint/README.rst
deleted file mode 100644
index 96a0133868..0000000000
--- a/tools/images/kubernetes-entrypoint/README.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-Kubernetes-Entrypoint Image Build
-=================================
-
-Builds an image with kubernetes-entrypoint for use with OpenStack-Helm.
-
-Prerequisites
--------------
-
-git, docker
-
-Instructions
-------------
-
-Build the Kubernetes-Entrypoint Image
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A known good image is published to docker hub on a fairly regular basis, but if
-you wish to build your own image, from the directory containing this README run:
-
-.. code:: bash
-    # Example configuration overrides, see Makefile for all available options:
-    # export IMAGE_REGISTRY=quay.io
-    # export GIT_REPO=https://github.com/someuser/kubernetes-entrypoint.git
-    # export GIT_REF=someref
-    make
diff --git a/tools/images/openstack/newton/loci.sh b/tools/images/openstack/newton/loci.sh
deleted file mode 100644
index 308735dac5..0000000000
--- a/tools/images/openstack/newton/loci.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-set -ex
-OPENSTACK_VERSION="newton-eol"
-IMAGE_TAG="newton"
-
-sudo docker run -d \
-  --name docker-in-docker \
-  --privileged=true \
-  --net=host \
-  -v /var/lib/docker \
-  -v ${HOME}/.docker/config.json:/root/.docker/config.json:ro\
-  docker.io/docker:17.07.0-dind \
-  dockerd \
-    --pidfile=/var/run/docker.pid \
-    --host=unix:///var/run/docker.sock \
-    --storage-driver=overlay2
-sudo docker exec docker-in-docker apk update
-sudo docker exec docker-in-docker apk add git
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --network host \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT=requirements \
-    --build-arg PROJECT_REF=stable/newton \
-    --tag docker.io/openstackhelm/requirements:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=keystone \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="apache ldap" \
-    --build-arg PIP_PACKAGES="pycrypto python-openstackclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/keystone:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=heat \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="curl" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/heat:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=barbican \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/barbican:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=glance \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="glance ceph" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/glance:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=cinder \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="cinder lvm ceph qemu" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/cinder:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=docker.io/ubuntu:18.04 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="ethtool lshw" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=nova \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="nova ceph linuxbridge openvswitch configdrive qemu apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/nova:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=horizon \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="horizon apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/horizon:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=senlin \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="senlin" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/senlin:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=congress \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="congress" \
-    --build-arg PIP_PACKAGES="pycrypto python-congressclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/congress:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=magnum \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="magnum" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/magnum:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=ironic \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="ironic ipxe ipmi qemu tftp" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="iproute2" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/ironic:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/ironic:${IMAGE_TAG}
diff --git a/tools/images/openstack/ocata/loci.sh b/tools/images/openstack/ocata/loci.sh
deleted file mode 100644
index 74a9227fc5..0000000000
--- a/tools/images/openstack/ocata/loci.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-set -ex
-OPENSTACK_VERSION="stable/ocata"
-IMAGE_TAG="${OPENSTACK_VERSION#*/}"
-
-sudo docker run -d \
-  --name docker-in-docker \
-  --privileged=true \
-  --net=host \
-  -v /var/lib/docker \
-  -v ${HOME}/.docker/config.json:/root/.docker/config.json:ro\
-  docker.io/docker:17.07.0-dind \
-  dockerd \
-    --pidfile=/var/run/docker.pid \
-    --host=unix:///var/run/docker.sock \
-    --storage-driver=overlay2
-sudo docker exec docker-in-docker apk update
-sudo docker exec docker-in-docker apk add git
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --network host \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT=requirements \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --tag docker.io/openstackhelm/requirements:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=keystone \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent apache ldap" \
-    --build-arg PIP_PACKAGES="pycrypto python-openstackclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/keystone:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=heat \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="curl" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/heat:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=barbican \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/barbican:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=glance \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent glance ceph" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/glance:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=cinder \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent cinder lvm ceph qemu" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/cinder:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=docker.io/ubuntu:18.04 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="ethtool lshw" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=nova \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/nova:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=horizon \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent horizon apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/horizon:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=senlin \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent senlin" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/senlin:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=congress \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent congress" \
-    --build-arg PIP_PACKAGES="pycrypto python-congressclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/congress:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=magnum \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent magnum" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/magnum:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=ironic \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent ironic ipxe ipmi qemu tftp" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="iproute2" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/ironic:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/ironic:${IMAGE_TAG}
diff --git a/tools/images/openstack/pike/loci.sh b/tools/images/openstack/pike/loci.sh
deleted file mode 100755
index c730243787..0000000000
--- a/tools/images/openstack/pike/loci.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-set -ex
-OPENSTACK_VERSION="stable/pike"
-IMAGE_TAG="${OPENSTACK_VERSION#*/}"
-
-sudo docker run -d \
-  --name docker-in-docker \
-  --privileged=true \
-  --net=host \
-  -v /var/lib/docker \
-  -v ${HOME}/.docker/config.json:/root/.docker/config.json:ro\
-  docker.io/docker:17.07.0-dind \
-  dockerd \
-    --pidfile=/var/run/docker.pid \
-    --host=unix:///var/run/docker.sock \
-    --storage-driver=overlay2
-sudo docker exec docker-in-docker apk update
-sudo docker exec docker-in-docker apk add git
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --network host \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT=requirements \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --tag docker.io/openstackhelm/requirements:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=keystone \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent apache ldap" \
-    --build-arg PIP_PACKAGES="pycrypto python-openstackclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/keystone:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=heat \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="curl" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/heat:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=barbican \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/barbican:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=glance \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent glance ceph" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/glance:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=cinder \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent cinder lvm ceph qemu" \
-    --build-arg PIP_PACKAGES="pycrypto python-swiftclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/cinder:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=neutron \
-    --build-arg FROM=docker.io/ubuntu:18.04 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent neutron linuxbridge openvswitch" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="ethtool lshw" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=nova \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/nova:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=horizon \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent horizon apache" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/horizon:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=senlin \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent senlin" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/senlin:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=congress \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent congress" \
-    --build-arg PIP_PACKAGES="pycrypto python-congressclient" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/congress:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=magnum \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent magnum" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/magnum:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
-
-sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://opendev.org/openstack/loci.git \
-    --build-arg PROJECT=ironic \
-    --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
-    --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
-    --build-arg PROFILES="fluent ironic ipxe ipmi qemu tftp" \
-    --build-arg PIP_PACKAGES="pycrypto" \
-    --build-arg DIST_PACKAGES="iproute2" \
-    --build-arg WHEELS=openstackhelm/requirements:${IMAGE_TAG} \
-    --tag docker.io/openstackhelm/ironic:${IMAGE_TAG}
-sudo docker exec docker-in-docker docker push docker.io/openstackhelm/ironic:${IMAGE_TAG}
diff --git a/tools/images/openvswitch/Dockerfile b/tools/images/openvswitch/Dockerfile
deleted file mode 100644
index 253c4eb4cb..0000000000
--- a/tools/images/openvswitch/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-FROM k8s.gcr.io/debian-iptables-amd64:v10
-MAINTAINER pete.birley@att.com
-
-ARG OVS_VERSION=2.8.1
-
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get upgrade -y ;\
-    apt-get install --no-install-recommends -y \
-        bash ;\
-    apt-get install --no-install-recommends -y \
-        build-essential \
-        curl \
-        libatomic1 \
-        libssl1.1 \
-        openssl \
-        uuid-runtime \
-        graphviz \
-        autoconf \
-        automake \
-        bzip2 \
-        debhelper \
-        dh-autoreconf \
-        libssl-dev \
-        libtool \
-        python-all \
-        python-six \
-        python-twisted-conch \
-        python-zopeinterface ;\
-    TMP_DIR=$(mktemp -d) ;\
-    curl -sSL http://openvswitch.org/releases/openvswitch-${OVS_VERSION}.tar.gz | tar xz -C ${TMP_DIR} --strip-components=1 ;\
-    cd ${TMP_DIR} ;\
-      ./boot.sh ;\
-      ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ;\
-      make ;\
-      make install ;\
-      cd / ;\
-    rm -rf ${TMP_DIR} ;\
-    apt-get purge --auto-remove -y \
-        build-essential \
-        curl \
-        graphviz \
-        autoconf \
-        automake \
-        bzip2 \
-        debhelper \
-        dh-autoreconf \
-        libssl-dev \
-        libtool \
-        python-all \
-        python-six \
-        python-twisted-conch \
-        python-zopeinterface  ;\
-    clean-install \
-        iproute2 ;\
diff --git a/tools/images/openvswitch/Makefile b/tools/images/openvswitch/Makefile
deleted file mode 100644
index 4b5d381e13..0000000000
--- a/tools/images/openvswitch/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-# It's necessary to set this because some environments don't link sh -> bash.
-SHELL := /bin/bash
-
-DOCKER_REGISTRY            ?= docker.io
-IMAGE_NAME                 ?= openvswitch
-IMAGE_PREFIX               ?= openstackhelm
-OVS_VERSION                ?= 2.8.1
-IMAGE_TAG                  ?= v$(OVS_VERSION)
-LABEL                      ?= putlabelshere
-
-IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-
-# Build openvswitch Docker image for this project
-.PHONY: images
-images: build_$(IMAGE_NAME)
-
-# Make targets intended for use by the primary targets above.
-.PHONY: build_$(IMAGE_NAME)
-build_$(IMAGE_NAME):
-	docker build \
-	--network=host \
-	--build-arg OVS_VERSION=$(OVS_VERSION) \
-	--label $(LABEL) \
-	-t $(IMAGE) \
-	.
diff --git a/tools/images/openvswitch/README.rst b/tools/images/openvswitch/README.rst
deleted file mode 100644
index 98796e2b81..0000000000
--- a/tools/images/openvswitch/README.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-OpenvSwitch Container
-=====================
-
-This container builds a small image with OpenvSwitch.
-
-Instructions
-------------
-
-OS Specific Host setup:
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Ubuntu:
-^^^^^^^
-
-From a freshly provisioned Ubuntu 16.04 LTS host run:
-
-.. code:: bash
-
-    sudo apt-get update -y
-    sudo apt-get install -y \
-            docker.io \
-            git
-
-Build the VBMC Image environment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A known good image is published to dockerhub on a fairly regular basis, but if
-you wish to build your own image, from the root directory of the OpenStack-Helm
-repo run:
-
-.. code:: bash
-
-    OVS_VERSION=2.8.1
-    sudo docker build \
-      --network=host \
-      --build-arg OVS_VERSION="${OVS_VERSION}" \
-      -t docker.io/openstackhelm/openvswitch:v${OVS_VERSION} \
-      tools/images/openvswitch
-    sudo docker push docker.io/openstackhelm/openvswitch:v${OVS_VERSION}
diff --git a/tools/images/tempest/Dockerfile b/tools/images/tempest/Dockerfile
deleted file mode 100644
index 4f99fe1566..0000000000
--- a/tools/images/tempest/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM ubuntu:16.04
-
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get upgrade -y ;\
-    apt-get install netbase -y ;\
-    apt-get install --no-install-recommends -y \
-        python-dev \
-        build-essential \
-        python-pip \
-        git ;\
-    git clone https://opendev.org/openstack/tempest ;\
-    git clone https://opendev.org/openstack/cinder-tempest-plugin ;\
-    git clone https://opendev.org/openstack/heat-tempest-plugin ;\
-    git clone https://opendev.org/openstack/keystone-tempest-plugin ;\
-    git clone https://opendev.org/openstack/neutron-tempest-plugin ;\
-    pip install -U setuptools ;\
-    pip install wheel ;\
-    pip install -e tempest/ \
-                   cinder-tempest-plugin/ \
-                   heat-tempest-plugin/ \
-                   keystone-tempest-plugin/ \
-                   neutron-tempest-plugin/ ;\
diff --git a/tools/images/tempest/Makefile b/tools/images/tempest/Makefile
deleted file mode 100644
index 2059648786..0000000000
--- a/tools/images/tempest/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.
-
-# It's necessary to set this because some environments don't link sh -> bash.
-SHELL := /bin/bash
-
-DOCKER_REGISTRY            ?= docker.io
-IMAGE_NAME                 ?= tempest
-IMAGE_PREFIX               ?= openstackhelm
-IMAGE_TAG                  ?= plugins
-LABEL                      ?= putlabelshere
-
-IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-
-# Build tempest Docker image for this project
-.PHONY: images
-images: build_$(IMAGE_NAME)
-
-# Make targets intended for use by the primary targets above.
-.PHONY: build_$(IMAGE_NAME)
-build_$(IMAGE_NAME):
-	docker build \
-	--network=host \
-	--force-rm \
-	--label $(LABEL) \
-	-t $(IMAGE) \
-	.