diff --git a/openvswitch/Chart.yaml b/openvswitch/Chart.yaml
index c1bc95f15..61ce790de 100644
--- a/openvswitch/Chart.yaml
+++ b/openvswitch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm OpenVSwitch
 name: openvswitch
-version: 0.1.20
+version: 0.1.21
 home: http://openvswitch.org
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/openvswitch/values_overrides/dpdk-opensuse_15.yaml b/openvswitch/values_overrides/dpdk-ubuntu_focal.yaml
similarity index 91%
rename from openvswitch/values_overrides/dpdk-opensuse_15.yaml
rename to openvswitch/values_overrides/dpdk-ubuntu_focal.yaml
index 86f81faf7..1b3c401db 100644
--- a/openvswitch/values_overrides/dpdk-opensuse_15.yaml
+++ b/openvswitch/values_overrides/dpdk-ubuntu_focal.yaml
@@ -1,8 +1,8 @@
 ---
 images:
   tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-opensuse_15-dpdk
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-opensuse_15-dpdk
+    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal-dpdk
+    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal-dpdk
 pod:
   resources:
     enabled: true
diff --git a/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml b/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml
similarity index 91%
rename from openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml
rename to openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml
index 21f4d39c3..28cd92d4d 100644
--- a/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml
+++ b/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml
@@ -1,8 +1,8 @@
 ---
 images:
   tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_bionic-dpdk
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_bionic-dpdk
+    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy-dpdk
+    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_jammy-dpdk
 pod:
   resources:
     enabled: true
diff --git a/openvswitch/values_overrides/rocky-opensuse_15.yaml b/openvswitch/values_overrides/rocky-opensuse_15.yaml
deleted file mode 100644
index df0633f2a..000000000
--- a/openvswitch/values_overrides/rocky-opensuse_15.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-images:
-  tags:
-    openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-opensuse_15
-    openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-opensuse_15
-...
diff --git a/releasenotes/notes/openvswitch.yaml b/releasenotes/notes/openvswitch.yaml
index b2d8e0b52..fa0c9cd89 100644
--- a/releasenotes/notes/openvswitch.yaml
+++ b/releasenotes/notes/openvswitch.yaml
@@ -21,4 +21,5 @@ openvswitch:
   - 0.1.18 Add value for extra poststart command
   - 0.1.19 Add check for cgroups v2 file structure
   - 0.1.20 Add Ubuntu Focal and Ubuntu Jammy overrides
+  - 0.1.21 Add overrides for dpdk
 ...