diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index e05869c38f..9bb9939f25 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -28,11 +28,11 @@ neutron_linuxbridge_agent_image: "{{ docker_registry ~ '/' if docker_registry el
 neutron_linuxbridge_agent_tag: "{{ openstack_release }}"
 neutron_linuxbridge_agent_image_full: "{{ neutron_linuxbridge_agent_image }}:{{ neutron_linuxbridge_agent_tag }}"
 
-openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ovs-vswitchd"
+openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-openvswitch-vswitchd"
 openvswitch_vswitchd_tag: "{{ openstack_release }}"
 openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}"
 
-openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ovs-db-server"
+openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-openvswitch-db-server"
 openvswitch_db_tag: "{{ openstack_release }}"
 openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}"
 
diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
similarity index 100%
rename from docker/openvswitch/ovs-base/Dockerfile.j2
rename to docker/openvswitch/openvswitch-base/Dockerfile.j2
diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
similarity index 63%
rename from docker/openvswitch/ovs-db-server/Dockerfile.j2
rename to docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index cca030e35e..023bba83b2 100644
--- a/docker/openvswitch/ovs-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY start.sh /
diff --git a/docker/openvswitch/ovs-db-server/start.sh b/docker/openvswitch/openvswitch-db-server/start.sh
similarity index 100%
rename from docker/openvswitch/ovs-db-server/start.sh
rename to docker/openvswitch/openvswitch-db-server/start.sh
diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
similarity index 70%
rename from docker/openvswitch/ovs-vswitchd/Dockerfile.j2
rename to docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 839da1f213..8dbd6548af 100644
--- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY start.sh /
diff --git a/docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
similarity index 100%
rename from docker/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
rename to docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
diff --git a/docker/openvswitch/ovs-vswitchd/start.sh b/docker/openvswitch/openvswitch-vswitchd/start.sh
similarity index 100%
rename from docker/openvswitch/ovs-vswitchd/start.sh
rename to docker/openvswitch/openvswitch-vswitchd/start.sh