diff --git a/templates/common/_base/files/configure-ovs-network.yaml b/templates/common/_base/files/configure-ovs-network.yaml
index 156d72676e..18e4144b47 100644
--- a/templates/common/_base/files/configure-ovs-network.yaml
+++ b/templates/common/_base/files/configure-ovs-network.yaml
@@ -4,6 +4,14 @@ contents:
   inline: |
     #!/bin/bash
     set -eux
+
+    # Workaround to ensure OVS is installed due to bug in systemd Requires:
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1888017
+    if ! rpm -qa | grep -q openvswitch; then
+      echo "Warning: Openvswitch package is not installed!"
+      exit 1
+    fi
+
     # Create file to signal that ovs-configuration has executed (we are booted into 4.6)
     # This is necessary because systemd calls from SDN containers are unreliable, so need to look for a file
     touch /var/run/ovs-config-executed