diff --git a/server/routers/org/createOrg.ts b/server/routers/org/createOrg.ts
index e0e42754..f1d06566 100644
--- a/server/routers/org/createOrg.ts
+++ b/server/routers/org/createOrg.ts
@@ -31,7 +31,12 @@ import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsFor
 const createOrgSchema = z.strictObject({
     orgId: z.string(),
     name: z.string().min(1).max(255),
-    subnet: z.string()
+    subnet: z
+        // .union([z.cidrv4(), z.cidrv6()])
+        .union([z.cidrv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
+        .refine((val) => isValidCIDR(val), {
+            message: "Invalid subnet CIDR"
+        })
 });
 
 registry.registerPath({
@@ -81,15 +86,6 @@ export async function createOrg(
 
         const { orgId, name, subnet } = parsedBody.data;
 
-        if (!isValidCIDR(subnet)) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Invalid subnet format. Please provide a valid CIDR notation."
-                )
-            );
-        }
-
         // TODO: for now we are making all of the orgs the same subnet
         // make sure the subnet is unique
         // const subnetExists = await db
diff --git a/server/routers/siteResource/createSiteResource.ts b/server/routers/siteResource/createSiteResource.ts
index e5719e7f..e9ce8e04 100644
--- a/server/routers/siteResource/createSiteResource.ts
+++ b/server/routers/siteResource/createSiteResource.ts
@@ -53,7 +53,8 @@ const createSiteResourceSchema = z
             if (data.mode === "host") {
                 // Check if it's a valid IP address using zod (v4 or v6)
                 const isValidIP = z
-                    .union([z.ipv4(), z.ipv6()])
+                    // .union([z.ipv4(), z.ipv6()])
+                    .union([z.ipv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
                     .safeParse(data.destination).success;
 
                 if (isValidIP) {
@@ -80,7 +81,8 @@ const createSiteResourceSchema = z
             if (data.mode === "cidr") {
                 // Check if it's a valid CIDR (v4 or v6)
                 const isValidCIDR = z
-                    .union([z.cidrv4(), z.cidrv6()])
+                    // .union([z.cidrv4(), z.cidrv6()])
+                    .union([z.cidrv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
                     .safeParse(data.destination).success;
                 return isValidCIDR;
             }
diff --git a/server/routers/siteResource/updateSiteResource.ts b/server/routers/siteResource/updateSiteResource.ts
index efc4939b..92704adb 100644
--- a/server/routers/siteResource/updateSiteResource.ts
+++ b/server/routers/siteResource/updateSiteResource.ts
@@ -62,7 +62,8 @@ const updateSiteResourceSchema = z
         (data) => {
             if (data.mode === "host" && data.destination) {
                 const isValidIP = z
-                    .union([z.ipv4(), z.ipv6()])
+                    // .union([z.ipv4(), z.ipv6()])
+                    .union([z.ipv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
                     .safeParse(data.destination).success;
 
                 if (isValidIP) {
@@ -89,7 +90,8 @@ const updateSiteResourceSchema = z
             if (data.mode === "cidr" && data.destination) {
                 // Check if it's a valid CIDR (v4 or v6)
                 const isValidCIDR = z
-                    .union([z.cidrv4(), z.cidrv6()])
+                    // .union([z.cidrv4(), z.cidrv6()])
+                    .union([z.cidrv4()]) // for now lets just do ipv4 until we verify ipv6 works everywhere
                     .safeParse(data.destination).success;
                 return isValidCIDR;
             }