diff --git a/salt/soc/dyanno/hypervisor/hypervisor.yaml b/salt/soc/dyanno/hypervisor/hypervisor.yaml
index 6b0458265..a629aebfd 100644
--- a/salt/soc/dyanno/hypervisor/hypervisor.yaml
+++ b/salt/soc/dyanno/hypervisor/hypervisor.yaml
@@ -31,22 +31,22 @@ hypervisor:
         - static4
         - dhcp4
       - field: ip4
-        label: "IP Address with netmask. ex. 192.168.1.10/24"
+        label: "IP address with netmask: 192.168.1.10/24 - If using dhcp, enter a character in this field and delete it. This will eliminate the incomplete/invalid setting entry error as well as the improperly formatted address error."
         forcedType: string
-        regex: '^(\d{1,3}\.){3}\d{1,3}/\d{1,2}$'
+        regex: "^$|^(\\d{1,3}\\.){3}\\d{1,3}/\\d{1,2}$"
         regexFailureMessage: "Enter a properly formatted CIDR address"
         readonly: true
       - field: gw4
-        label: "Gateway"
+        label: "Gateway - If using dhcp, enter a character in this field and delete it. This will eliminate the incomplete/invalid setting entry error as well as the improperly formatted address error."
         forcedType: string
-        regex: '^(\d{1,3}\.){3}\d{1,3}$'
+        regex: "^$|^(\\d{1,3}\\.){3}\\d{1,3}$"
         regexFailureMessage: "Enter a properly formatted IP address"
         readonly: true
       - field: dns4
-        label: "DNS. Comma separated list. ex. 192.168.1.1,8.8.8.8"
+        label: "Single DNS IP or comma separated list: 192.168.1.1,8.8.8.8 - If using dhcp, enter a character in this field and delete it. This will eliminate the incomplete/invalid setting entry error as well as the improperly formatted address error."
         forcedType: string
-        regex: '^(\d{1,3}\.){3}\d{1,3}$'
-        regexFailureMessage: "Enter a properly formatted IP address"
+        regex: "^$|^(\\d{1,3}\\.){3}\\d{1,3}(,\\s*(\\d{1,3}\\.){3}\\d{1,3})*$"
+        regexFailureMessage: "Enter a properly formatted IP address or list of addresses"
         readonly: true
       - field: search4
         label: "Search domain"