diff --git a/schema/interface.tunnel.gre.yml b/schema/interface.tunnel.gre.yml
index 33713c0..c3ccaf0 100644
--- a/schema/interface.tunnel.gre.yml
+++ b/schema/interface.tunnel.gre.yml
@@ -12,7 +12,7 @@ properties:
       This is the IP address of the remote host, that the GRE tunnel shall be
       established with.
     type: string
-    format: uc-cidr4
+    format: ipv4
     example: '192.168.100.1'
   vlan-id:
     description:
diff --git a/schema/interface.tunnel.vxlan.yml b/schema/interface.tunnel.vxlan.yml
index d689da6..8e9a57a 100644
--- a/schema/interface.tunnel.vxlan.yml
+++ b/schema/interface.tunnel.vxlan.yml
@@ -12,7 +12,7 @@ properties:
       This is the IP address of the remote host, that the VXLAN tunnel shall be
       established with.
     type: string
-    format: uc-cidr4
+    format: ipv4
     example: '192.168.100.1'
   peer-port:
     description:
diff --git a/schemareader.uc b/schemareader.uc
index fa5fae0..42b402c 100644
--- a/schemareader.uc
+++ b/schemareader.uc
@@ -2708,8 +2708,8 @@ function instantiateInterfaceTunnelVxlan(location, value, errors) {
 
 		function parsePeerAddress(location, value, errors) {
 			if (type(value) == "string") {
-				if (!matchUcCidr4(value))
-					push(errors, [ location, "must be a valid IPv4 CIDR" ]);
+				if (!matchIpv4(value))
+					push(errors, [ location, "must be a valid IPv4 address" ]);
 
 			}
 
@@ -2772,8 +2772,8 @@ function instantiateInterfaceTunnelGre(location, value, errors) {
 
 		function parsePeerAddress(location, value, errors) {
 			if (type(value) == "string") {
-				if (!matchUcCidr4(value))
-					push(errors, [ location, "must be a valid IPv4 CIDR" ]);
+				if (!matchIpv4(value))
+					push(errors, [ location, "must be a valid IPv4 address" ]);
 
 			}
 
diff --git a/ucentral.schema.json b/ucentral.schema.json
index 7321bd0..a317c64 100644
--- a/ucentral.schema.json
+++ b/ucentral.schema.json
@@ -1089,7 +1089,7 @@
                 },
                 "peer-address": {
                     "type": "string",
-                    "format": "uc-cidr4",
+                    "format": "ipv4",
                     "example": "192.168.100.1"
                 },
                 "peer-port": {
@@ -1111,7 +1111,7 @@
                 },
                 "peer-address": {
                     "type": "string",
-                    "format": "uc-cidr4",
+                    "format": "ipv4",
                     "example": "192.168.100.1"
                 },
                 "vlan-id": {