diff --git a/openvswitch/Dockerfile.debian-dpdk b/openvswitch/Dockerfile.debian-dpdk
deleted file mode 100644
index 77a98d1..0000000
--- a/openvswitch/Dockerfile.debian-dpdk
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM k8s.gcr.io/debian-iptables-amd64:v10
-LABEL maintainer="pete.birley@att.com"
-
-ARG OVS_VERSION=2.10.1
-ARG DPDK_VERSION=17.11.5
-
-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 \
-        libnuma-dev \
-        linux-headers-amd64 ;\
-    TMP_DIR=$(mktemp -d) ;\
-    curl -sSL http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.xz | tar xJ -C ${TMP_DIR} --strip-components=1 ;\
-    export DPDK_DIR=${TMP_DIR} ;\
-    cd ${DPDK_DIR} ;\
-    export DPDK_TARGET=x86_64-native-linuxapp-gcc ;\
-    export DPDK_BUILD=${DPDK_DIR}/${DPDK_TARGET} ;\
-    export RTE_KERNELDIR=/usr/src/$(ls -1 /usr/src/ | grep amd64) ;\
-    make install T=${DPDK_TARGET} DESTDIR=install ;\
-    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 --with-dpdk=$DPDK_BUILD ;\
-      make ;\
-      make install ;\
-      cd / ;\
-    rm -rf ${DPDK_DIR} ;\
-    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/openvswitch/Dockerfile.ubuntu_bionic b/openvswitch/Dockerfile.ubuntu_bionic
new file mode 100644
index 0000000..0b8ec16
--- /dev/null
+++ b/openvswitch/Dockerfile.ubuntu_bionic
@@ -0,0 +1,8 @@
+FROM docker.io/ubuntu:bionic
+LABEL maintainer="cheng1.li@intel.com"
+
+RUN set -ex; \
+    apt-get update; \
+    apt-get install -y openvswitch-switch; \
+    rm -rf /var/lib/apt/lists/*
+
diff --git a/openvswitch/Dockerfile.ubuntu_bionic-dpdk b/openvswitch/Dockerfile.ubuntu_bionic-dpdk
new file mode 100644
index 0000000..758cdc9
--- /dev/null
+++ b/openvswitch/Dockerfile.ubuntu_bionic-dpdk
@@ -0,0 +1,9 @@
+FROM docker.io/ubuntu:bionic
+LABEL maintainer="cheng1.li@intel.com"
+
+RUN set -ex;\
+    apt-get update; \
+    apt-get install -y openvswitch-switch-dpdk; \
+    update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk; \
+    rm -rf /var/lib/apt/lists/*
+
diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml
index 908fae8..7c30ed3 100644
--- a/zuul.d/openvswitch.yaml
+++ b/zuul.d/openvswitch.yaml
@@ -45,9 +45,14 @@
             - latest-debian
         - context: openvswitch
           repository: openstackhelm/openvswitch
-          dockerfile: Dockerfile.debian-dpdk
+          dockerfile: Dockerfile.ubuntu_bionic
           tags:
-            - latest-debian-dpdk
+            - latest-ubuntu_bionic
+        - context: openvswitch
+          repository: openstackhelm/openvswitch
+          dockerfile: Dockerfile.ubuntu_bionic-dpdk
+          tags:
+            - latest-ubuntu_bionic-dpdk
     files: &openvswitch_files
       - openvswitch/.*
       - zuul.d/openvswitch.yaml