diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 821eade104..295a58dde5 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -243,7 +243,7 @@ outputs:
             - name: Get current OpenvSwitch package name
               register: ovs_pkg_out
               shell:
-                rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}'
+                rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}'
             - name: Get version from current OpenvSwitch package
               register: ovs_version_out
               shell:
diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml
index 0613f2dde2..27e7b6464a 100644
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@@ -92,7 +92,7 @@ outputs:
             - name: Get current OpenvSwitch package name
               register: ovs_pkg_out
               shell:
-                rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-|openvswitch-2)/{print $1}'
+                rpm -qa | awk -F- '/^(openvswitch[0-9]+\.[0-9]+-[0-9]+\.[0-9]+\.[-0]+-|openvswitch-2)/{print $1}'
             - name: Get version from current OpenvSwitch package
               register: ovs_version_out
               shell: