diff --git a/docker/services/undercloud-upgrade.yaml b/docker/services/undercloud-upgrade.yaml
index 08397cc0df..3654a355ac 100644
--- a/docker/services/undercloud-upgrade.yaml
+++ b/docker/services/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:
diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index c73621620e..9c656fc614 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -151,7 +151,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: