diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index 925a8fb2b8..f32b38fea2 100644
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@@ -21,8 +21,8 @@ release_group: null
 
 images:
   tags:
-    openvswitch_db_server: docker.io/kolla/ubuntu-source-openvswitch-db-server:3.0.3
-    openvswitch_vswitchd: docker.io/kolla/ubuntu-source-openvswitch-vswitchd:3.0.3
+    openvswitch_db_server: docker.io/openstackhelm/openvswitch:v2.8.1
+    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:v2.8.1
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"
 
diff --git a/tools/images/openvswitch/Dockerfile b/tools/images/openvswitch/Dockerfile
new file mode 100644
index 0000000000..253c4eb4cb
--- /dev/null
+++ b/tools/images/openvswitch/Dockerfile
@@ -0,0 +1,56 @@
+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/README.rst b/tools/images/openvswitch/README.rst
new file mode 100644
index 0000000000..98796e2b81
--- /dev/null
+++ b/tools/images/openvswitch/README.rst
@@ -0,0 +1,39 @@
+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/overrides/releases/newton/kolla.yaml b/tools/overrides/releases/newton/kolla.yaml
index 345981b332..2de75766dc 100644
--- a/tools/overrides/releases/newton/kolla.yaml
+++ b/tools/overrides/releases/newton/kolla.yaml
@@ -69,6 +69,8 @@ images:
     nova_scheduler: 'docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3'
     nova_spiceproxy: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
     nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
+    openvswitch_db_server: 'docker.io/kolla/ubuntu-source-openvswitch-db-server:3.0.3'
+    openvswitch_vswitchd: 'docker.io/kolla/ubuntu-source-openvswitch-vswitchd:3.0.3'
     scripted_test: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
     senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'
     senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'