diff --git a/Jenkinsfile.VCR-capture b/Jenkinsfile.VCR-capture
index 7177797..233b30b 100644
--- a/Jenkinsfile.VCR-capture
+++ b/Jenkinsfile.VCR-capture
@@ -93,11 +93,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.cd-to-iso b/Jenkinsfile.cd-to-iso
index 11cc33c..973e77f 100644
--- a/Jenkinsfile.cd-to-iso
+++ b/Jenkinsfile.cd-to-iso
@@ -26,11 +26,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.cifs-mount b/Jenkinsfile.cifs-mount
index 08b2d95..f275a6a 100644
--- a/Jenkinsfile.cifs-mount
+++ b/Jenkinsfile.cifs-mount
@@ -27,11 +27,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.cosmos-base b/Jenkinsfile.cosmos-base
index c9e6a3a..cf5605d 100644
--- a/Jenkinsfile.cosmos-base
+++ b/Jenkinsfile.cosmos-base
@@ -37,11 +37,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.cosmos-console b/Jenkinsfile.cosmos-console
index 594aefc..417fd8b 100644
--- a/Jenkinsfile.cosmos-console
+++ b/Jenkinsfile.cosmos-console
@@ -35,11 +35,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.cosmos-kiosk b/Jenkinsfile.cosmos-kiosk
index e742bb3..f7d1dea 100644
--- a/Jenkinsfile.cosmos-kiosk
+++ b/Jenkinsfile.cosmos-kiosk
@@ -96,11 +96,12 @@ pipeline {
                 // Also create the kiosk variable yaml with hash value
                 sh """
 
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 
                 hash=\$(echo -n "${params.host_ip}" | md5sum | cut -c 1-8)
diff --git a/Jenkinsfile.cosmos-nvidia b/Jenkinsfile.cosmos-nvidia
index e5e3338..34c7821 100644
--- a/Jenkinsfile.cosmos-nvidia
+++ b/Jenkinsfile.cosmos-nvidia
@@ -21,11 +21,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.cosmos-public b/Jenkinsfile.cosmos-public
index ed33209..e9a26f3 100644
--- a/Jenkinsfile.cosmos-public
+++ b/Jenkinsfile.cosmos-public
@@ -31,11 +31,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.cosmos-server b/Jenkinsfile.cosmos-server
index 2f10f17..33341ad 100644
--- a/Jenkinsfile.cosmos-server
+++ b/Jenkinsfile.cosmos-server
@@ -108,11 +108,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
 
                 """
diff --git a/Jenkinsfile.deb_init b/Jenkinsfile.deb_init
index 16b7f66..8ceb775 100644
--- a/Jenkinsfile.deb_init
+++ b/Jenkinsfile.deb_init
@@ -91,11 +91,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.jenkins_vpn b/Jenkinsfile.jenkins_vpn
index c4396bc..a76a8ed 100644
--- a/Jenkinsfile.jenkins_vpn
+++ b/Jenkinsfile.jenkins_vpn
@@ -27,11 +27,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 echo 'echo Hello World' > /var/jenkins_home/ansible/.inv/vpn_check.sh
                 chmod +x /var/jenkins_home/ansible/.inv/vpn_check.sh
diff --git a/Jenkinsfile.lldp-scanner b/Jenkinsfile.lldp-scanner
index 1a1b2f4..419ff1b 100644
--- a/Jenkinsfile.lldp-scanner
+++ b/Jenkinsfile.lldp-scanner
@@ -30,11 +30,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.matt-profile-capture b/Jenkinsfile.matt-profile-capture
index 76520f7..406d67f 100644
--- a/Jenkinsfile.matt-profile-capture
+++ b/Jenkinsfile.matt-profile-capture
@@ -22,11 +22,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.mattgpt-capture b/Jenkinsfile.mattgpt-capture
index b404faf..01fec82 100644
--- a/Jenkinsfile.mattgpt-capture
+++ b/Jenkinsfile.mattgpt-capture
@@ -22,11 +22,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.mc_vpn b/Jenkinsfile.mc_vpn
index a4a06af..89bf95b 100644
--- a/Jenkinsfile.mc_vpn
+++ b/Jenkinsfile.mc_vpn
@@ -72,14 +72,15 @@ pipeline {
             steps {
                 // Generate the dynamic inventory files
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 vpn_ip=\$(cat /var/jenkins_home/ansible/roles/puck_vpn/vars/endpoints/${params.new_hostname}.yaml | grep remote_gateway | cut -d '"' -f 2)
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i \$vpn_ip
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i \$vpn_ip
 
                 """
             }
diff --git a/Jenkinsfile.pi-top b/Jenkinsfile.pi-top
index 643a917..3f480e2 100644
--- a/Jenkinsfile.pi-top
+++ b/Jenkinsfile.pi-top
@@ -110,11 +110,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.pi_init b/Jenkinsfile.pi_init
index e9fc80d..360466f 100644
--- a/Jenkinsfile.pi_init
+++ b/Jenkinsfile.pi_init
@@ -59,11 +59,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.public-profile-capture b/Jenkinsfile.public-profile-capture
index d67c688..6b8d693 100644
--- a/Jenkinsfile.public-profile-capture
+++ b/Jenkinsfile.public-profile-capture
@@ -22,11 +22,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.pxe-server b/Jenkinsfile.pxe-server
index b275959..a6c6fb6 100644
--- a/Jenkinsfile.pxe-server
+++ b/Jenkinsfile.pxe-server
@@ -42,11 +42,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.rename-endpoint b/Jenkinsfile.rename-endpoint
index 47e9568..6f37e09 100644
--- a/Jenkinsfile.rename-endpoint
+++ b/Jenkinsfile.rename-endpoint
@@ -25,11 +25,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.rip-cd b/Jenkinsfile.rip-cd
index b4564be..9fd1042 100644
--- a/Jenkinsfile.rip-cd
+++ b/Jenkinsfile.rip-cd
@@ -30,11 +30,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.test b/Jenkinsfile.test
index 73ac737..f9308c1 100644
--- a/Jenkinsfile.test
+++ b/Jenkinsfile.test
@@ -39,11 +39,13 @@ pipeline {
 
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -s -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.trixie_upgrade b/Jenkinsfile.trixie_upgrade
index 4dab554..79d3ef8 100644
--- a/Jenkinsfile.trixie_upgrade
+++ b/Jenkinsfile.trixie_upgrade
@@ -22,11 +22,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
 
                 """
             }
diff --git a/Jenkinsfile.update-endpoint b/Jenkinsfile.update-endpoint
index f55f99a..72552e1 100644
--- a/Jenkinsfile.update-endpoint
+++ b/Jenkinsfile.update-endpoint
@@ -21,11 +21,12 @@ pipeline {
             steps {
                 // Generate the dynamic inventory file
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
                 """
             }
         }
diff --git a/Jenkinsfile.vm_party b/Jenkinsfile.vm_party
index 33e8a7e..05ca5cf 100644
--- a/Jenkinsfile.vm_party
+++ b/Jenkinsfile.vm_party
@@ -44,11 +44,12 @@ pipeline {
                 }
                 // Generate the dynamic inventory files
                 sh """
-                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep Jenkins | head -n 1)
+                jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
+                jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} |  sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
                 jenkins_user=\$(echo ${env.BUILD_USER})
                 cd /var/jenkins_home/ansible
                 chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
-                /var/jenkins_home/ansible/inventory/inventory.sh -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
+                /var/jenkins_home/ansible/inventory/inventory.sh -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip} 
                 echo Stage Two Hash: ${env.STAGE_TWO_HASH}
 
                 """