diff --git a/Jenkinsfile.VCR-capture b/Jenkinsfile.VCR-capture
index a15c2ef..7177797 100644
--- a/Jenkinsfile.VCR-capture
+++ b/Jenkinsfile.VCR-capture
@@ -112,8 +112,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/VCR-capture.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/VCR-capture.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "docker_full=false no_vpn=true add_domain=false  \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
                                   cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
diff --git a/Jenkinsfile.behemoth_containers b/Jenkinsfile.behemoth_containers
index e96f2e2..8d0af19 100644
--- a/Jenkinsfile.behemoth_containers
+++ b/Jenkinsfile.behemoth_containers
@@ -37,8 +37,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/behemoth-containers.yaml --ssh-common-args='-o StrictHostKeyChecking=no' 
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/behemoth-containers.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' 
                 
                 """
             }
diff --git a/Jenkinsfile.cd-to-iso b/Jenkinsfile.cd-to-iso
index e7a4282..11cc33c 100644
--- a/Jenkinsfile.cd-to-iso
+++ b/Jenkinsfile.cd-to-iso
@@ -48,10 +48,10 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cd-to-iso.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cd-to-iso.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "disk_drive=${params.disk_drive} eject_drive=${params.eject_drive} \
-                    destination_path=${params.destination_path} create_iso=${params.create_iso}"
+                                  destination_path=${params.destination_path} create_iso=${params.create_iso}"
                 
                 """
             }
diff --git a/Jenkinsfile.cifs-mount b/Jenkinsfile.cifs-mount
index 7de496b..08b2d95 100644
--- a/Jenkinsfile.cifs-mount
+++ b/Jenkinsfile.cifs-mount
@@ -48,8 +48,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cifs-mount.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cifs-mount.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "CIFS_USERNAME=${env.CIFS_CREDENTIALS_USR} CIFS_PASSWORD=${env.CIFS_CREDENTIALS_PSW} \
                                   server_path=${params.server_path} target_path=${params.target_path} validate_share=${params.validate_share} \
                                   CIFS_CREDENTIALS=${env.CIFS_CREDENTIALS} CIFS_CHOICE=${params.cifs_choice}"
diff --git a/Jenkinsfile.cosmos-base b/Jenkinsfile.cosmos-base
index 6f2eb27..c9e6a3a 100644
--- a/Jenkinsfile.cosmos-base
+++ b/Jenkinsfile.cosmos-base
@@ -59,12 +59,13 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-base.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                    --extra-vars "new_hostname=${params.new_hostname}.home.cosmos saturn_behemoth=${env.SATURN_BEHEMOTH} rename_host=${params.rename_host} \
-                                  reboot_host=${params.reboot_host} config_matt=${params.config_matt} docker_full=true \
-                                  kde_full=true apps_list=${env.APPS_LIST} linux_ldap_pwd=${env.LINUX_LDAP_PWD} \
-                                  install_LDAP=${params.install_LDAP} MATT_PASSWORD=${env.MATT_PASSWORD} no_vpn=${params.remove_default_vpn} \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-base.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "kde_full=true docker_full=true rename_host=${params.rename_host} no_vpn=${params.remove_default_vpn} \
+                                  new_hostname=${params.new_hostname}.home.cosmos saturn_behemoth=${env.SATURN_BEHEMOTH} 
+                                  reboot_host=${params.reboot_host} config_matt=${params.config_matt} \
+                                  apps_list=${env.APPS_LIST} linux_ldap_pwd=${env.LINUX_LDAP_PWD} \
+                                  install_LDAP=${params.install_LDAP} MATT_PASSWORD=${env.MATT_PASSWORD} \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
                                   cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' "
                 
diff --git a/Jenkinsfile.cosmos-console b/Jenkinsfile.cosmos-console
index c003613..594aefc 100644
--- a/Jenkinsfile.cosmos-console
+++ b/Jenkinsfile.cosmos-console
@@ -57,14 +57,13 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-console.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                    --extra-vars "new_hostname=${params.new_hostname}.home.cosmos saturn_behemoth=${SATURN_BEHEMOTH} \
-                                  docker_full=false rename_host=${params.rename_endpoint} \
-                                  linux_ldap_pwd=${LINUX_LDAP_PWD} install_docker=false \
-                                  install_LDAP=false console_type=${params.console_type} \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-console.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "docker_full=falsei nstall_docker=false install_LDAP=false\
+                                  new_hostname=${params.new_hostname}.home.cosmos saturn_behemoth=${SATURN_BEHEMOTH} \
+                                  rename_host=${params.rename_endpoint} console_type=${params.console_type} \
+                                  linux_ldap_pwd=${LINUX_LDAP_PWD} PXE_API_KEY=${PXE_API_KEY} \
                                   refresh_special=${params.refresh_special} pxe_proxy_password=${pxe_proxy_password} \
-                                  PXE_API_KEY=${PXE_API_KEY} \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
                                   cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' "
                 
diff --git a/Jenkinsfile.cosmos-kiosk b/Jenkinsfile.cosmos-kiosk
index 3e85b14..e742bb3 100644
--- a/Jenkinsfile.cosmos-kiosk
+++ b/Jenkinsfile.cosmos-kiosk
@@ -130,8 +130,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-kiosk.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-kiosk.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "docker_full=false no_vpn=true jenkins_kiosk=true public_deploy=true \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
                                   cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
diff --git a/Jenkinsfile.cosmos-nvidia b/Jenkinsfile.cosmos-nvidia
index 70cf462..e5e3338 100644
--- a/Jenkinsfile.cosmos-nvidia
+++ b/Jenkinsfile.cosmos-nvidia
@@ -43,8 +43,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-nvidia.yaml --ssh-common-args='-o StrictHostKeyChecking=no' 
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-nvidia.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' 
                 
                 """
             }
diff --git a/Jenkinsfile.cosmos-public b/Jenkinsfile.cosmos-public
index ccc322b..ed33209 100644
--- a/Jenkinsfile.cosmos-public
+++ b/Jenkinsfile.cosmos-public
@@ -53,8 +53,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-public.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-public.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "new_hostname=${params.new_hostname} rename_host=${params.rename_host} reboot_host=${params.reboot_host} \
                                   local_username=${params.local_username} kde_full=false apps_list=${APPS_LIST} docker_full=true \
                                   reset_user=${params.reset_user} public_deploy=true matt_public_key='${env.matt_public_key}'\
diff --git a/Jenkinsfile.cosmos-server b/Jenkinsfile.cosmos-server
index 3c9b922..2f10f17 100644
--- a/Jenkinsfile.cosmos-server
+++ b/Jenkinsfile.cosmos-server
@@ -130,8 +130,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/cosmos-server.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-server.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "new_hostname=${params.new_hostname} saturn_behemoth=${SATURN_BEHEMOTH} \
                                   CIFS_USERNAME=${env.CIFS_CREDENTIALS_USR} CIFS_PASSWORD=${env.CIFS_CREDENTIALS_PSW} \
                                   docker_full=false rename_host=${params.rename_endpoint} onboard_pi=${params.onboard_pi} \
diff --git a/Jenkinsfile.deb_init b/Jenkinsfile.deb_init
index 39414d8..16b7f66 100644
--- a/Jenkinsfile.deb_init
+++ b/Jenkinsfile.deb_init
@@ -110,8 +110,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/pi-init.yaml --ssh-common-args='-o StrictHostKeyChecking=no' 
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/pi-init.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' 
                 
                 """
             }
diff --git a/Jenkinsfile.jenkins_vpn b/Jenkinsfile.jenkins_vpn
index 9172ac3..c4396bc 100644
--- a/Jenkinsfile.jenkins_vpn
+++ b/Jenkinsfile.jenkins_vpn
@@ -50,8 +50,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/jenkins_vpn.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/jenkins_vpn.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "new_hostname=${params.new_hostname}.home.cosmos  vpn_endpoint='${params.vpn_endpoint}' \
                                   cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' "
diff --git a/Jenkinsfile.lldp-scanner b/Jenkinsfile.lldp-scanner
index ead1ccb..1a1b2f4 100644
--- a/Jenkinsfile.lldp-scanner
+++ b/Jenkinsfile.lldp-scanner
@@ -45,14 +45,19 @@ pipeline {
                 //Run the cosmos-base ansible playbook
                 // /workspace/ansible/playbooks/cosmos-base.yaml
                 sh """
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                    /var/jenkins_home/ansible/playbooks/lldp-scan.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/lldp-scan.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "new_hostname=MC-LLDP fixed_size='--window-size=${params.chrome_resolution}' \
-                    run_test=${params.run_test} rename_host=true refresh_only=${params.refresh_only} \
-                    public_deploy=true no_vpn=true matt_public_key='${env.matt_public_key}' \
-                    cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' "
+                                  run_test=${params.run_test} rename_host=true refresh_only=${params.refresh_only} \
+                                  public_deploy=true no_vpn=true matt_public_key='${env.matt_public_key}' \
+                                  cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' "
                 
                 """
             }
diff --git a/Jenkinsfile.matt-profile-capture b/Jenkinsfile.matt-profile-capture
index f64310b..76520f7 100644
--- a/Jenkinsfile.matt-profile-capture
+++ b/Jenkinsfile.matt-profile-capture
@@ -36,11 +36,16 @@ pipeline {
             steps {
                 //Run the cosmos-base ansible playbook
                 sh """
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                /var/jenkins_home/ansible/playbooks/matt-capture.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
+                ansible-playbook -i  \$inventory_file /var/jenkins_home/ansible/playbooks/matt-capture.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
                 
                 """
             }
diff --git a/Jenkinsfile.mattgpt-capture b/Jenkinsfile.mattgpt-capture
index 8310d78..b404faf 100644
--- a/Jenkinsfile.mattgpt-capture
+++ b/Jenkinsfile.mattgpt-capture
@@ -36,11 +36,16 @@ pipeline {
             steps {
                 //Run the cosmos-base ansible playbook
                 sh """
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                /var/jenkins_home/ansible/playbooks/mattgpt-capture.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
+                ansible-playbook -i  \$inventory_file /var/jenkins_home/ansible/playbooks/mattgpt-capture.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
                 
                 """
             }
diff --git a/Jenkinsfile.mc_vpn b/Jenkinsfile.mc_vpn
index 9ce4ba4..a4a06af 100644
--- a/Jenkinsfile.mc_vpn
+++ b/Jenkinsfile.mc_vpn
@@ -120,10 +120,10 @@ pipeline {
                 cd /var/jenkins_home/ansible
 
                 ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/puck_vpn.yaml \
-                --ssh-common-args='-o StrictHostKeyChecking=no' --extra-vars \
-                "new_hostname=${params.new_hostname} matt_public_key='${env.matt_public_key}' \
-                cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
-                redirect_all=${params.redirect_all} "
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "new_hostname=${params.new_hostname} matt_public_key='${env.matt_public_key}' \
+                                  cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
+                                  redirect_all=${params.redirect_all} "
                 """
             }
         }
diff --git a/Jenkinsfile.pi-top b/Jenkinsfile.pi-top
index 207b617..643a917 100644
--- a/Jenkinsfile.pi-top
+++ b/Jenkinsfile.pi-top
@@ -134,8 +134,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/pi-top.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/pi-top.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars " function=${params.function} admin_username='${params.admin_username}'  "
                 
                 """
diff --git a/Jenkinsfile.pi_init b/Jenkinsfile.pi_init
index 853e9a6..e9fc80d 100644
--- a/Jenkinsfile.pi_init
+++ b/Jenkinsfile.pi_init
@@ -78,8 +78,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/pi-init.yaml --ssh-common-args='-o StrictHostKeyChecking=no' 
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/pi-init.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' 
                 
                 """
             }
diff --git a/Jenkinsfile.public-profile-capture b/Jenkinsfile.public-profile-capture
index e08bcd1..d67c688 100644
--- a/Jenkinsfile.public-profile-capture
+++ b/Jenkinsfile.public-profile-capture
@@ -36,11 +36,16 @@ pipeline {
             steps {
                 //Run the cosmos-base ansible playbook
                 sh """
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                /var/jenkins_home/ansible/playbooks/public-capture.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/public-capture.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} "
                 
                 """
             }
diff --git a/Jenkinsfile.pxe-server b/Jenkinsfile.pxe-server
index 714cc45..b275959 100644
--- a/Jenkinsfile.pxe-server
+++ b/Jenkinsfile.pxe-server
@@ -57,10 +57,16 @@ pipeline {
                 //Run the pxe-server ansible playbook
                 // /workspace/ansible/playbooks/pxe-server.yaml
                 sh """
+
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                    /var/jenkins_home/ansible/playbooks/pxe-server.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/pxe-server.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "new_hostname=debian-pxe.home.cosmos saturn_behemoth=${SATURN_BEHEMOTH} authorized_key=${AUTHORIZED_KEY} \
                                   rename_host=true apps_list=${APPS_LIST} listen_interface=${params.iface} pxe_auth=${pxe_proxy_password} \
                                   internet_interface=${params.inet_iface} dhcp_subnet=${params.dhcp_subnet} \
diff --git a/Jenkinsfile.rename-endpoint b/Jenkinsfile.rename-endpoint
index 0d2e69c..47e9568 100644
--- a/Jenkinsfile.rename-endpoint
+++ b/Jenkinsfile.rename-endpoint
@@ -39,11 +39,15 @@ pipeline {
             steps {
                 //Run the cosmos-base ansible playbook
                 sh """
+                echo ${params.host_ip}
+                hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
+                inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
+
                 cd /var/jenkins_home/ansible
                 
-                ansible-playbook -i /var/jenkins_home/ansible/.inv/inventory-${params.host_ip}.yml \
-                /var/jenkins_home/ansible/playbooks/rename-endpoint.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
-                --extra-vars "new_hostname=${params.new_hostname} add_domain=${params.add_domain}"
+                ansible-playbook -i  \$inventory_file /var/jenkins_home/ansible/playbooks/rename-endpoint.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "new_hostname=${params.new_hostname} add_domain=${params.add_domain}"
                 
                 """
             }
diff --git a/Jenkinsfile.rip-cd b/Jenkinsfile.rip-cd
index 3b3a9f4..b4564be 100644
--- a/Jenkinsfile.rip-cd
+++ b/Jenkinsfile.rip-cd
@@ -51,8 +51,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/rip-cd.yaml --ssh-common-args='-o StrictHostKeyChecking=no' \
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/rip-cd.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
                     --extra-vars "CIFS_USERNAME=${env.CIFS_CREDENTIALS_USR} CIFS_PASSWORD=${env.CIFS_CREDENTIALS_PSW} \
                                   CIFS_CREDENTIALS=${env.CIFS_CREDENTIALS} CIFS_CHOICE=${params.cifs_choice} \
                                   disk_drive=${params.disk_drive} extra_verbose=${params.extra_verbose} \
diff --git a/Jenkinsfile.test b/Jenkinsfile.test
index 5e28024..73ac737 100644
--- a/Jenkinsfile.test
+++ b/Jenkinsfile.test
@@ -58,16 +58,16 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/test.yaml --ssh-common-args='-o StrictHostKeyChecking=no'\
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/test.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no'\
                     --extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} linux_ldap_pwd=${LINUX_LDAP_PWD} \
-                    pxe_proxy_password=${pxe_proxy_password} PXE_API_KEY=${PXE_API_KEY} \
-                    AUTHORIZED_KEY=${AUTHORIZED_KEY} TERRA_BEHEMOTH_SMB=${TERRA_BEHEMOTH_SMB} \
-                    CIFS_USERNAME=${env.TERRA_BEHEMOTH_SMB_USR} CIFS_PASSWORD=${env.TERRA_BEHEMOTH_SMB_PSW} \
-                    MATT_PASSWORD=${env.MATT_PASSWORD} host_ip=${params.host_ip}  \
-                    matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
-                    cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
-                    vm_party_username_password=${env.vm_party_username_password} }"
+                                  pxe_proxy_password=${pxe_proxy_password} PXE_API_KEY=${PXE_API_KEY} \
+                                  AUTHORIZED_KEY=${AUTHORIZED_KEY} TERRA_BEHEMOTH_SMB=${TERRA_BEHEMOTH_SMB} \
+                                  CIFS_USERNAME=${env.TERRA_BEHEMOTH_SMB_USR} CIFS_PASSWORD=${env.TERRA_BEHEMOTH_SMB_PSW} \
+                                  MATT_PASSWORD=${env.MATT_PASSWORD} host_ip=${params.host_ip}  \
+                                  matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
+                                  cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
+                                  vm_party_username_password=${env.vm_party_username_password} }"
                 """
             }
         }
diff --git a/Jenkinsfile.trixie_upgrade b/Jenkinsfile.trixie_upgrade
index 75f0ad6..4dab554 100644
--- a/Jenkinsfile.trixie_upgrade
+++ b/Jenkinsfile.trixie_upgrade
@@ -43,8 +43,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/trixie_upgrade.yaml --ssh-common-args='-o StrictHostKeyChecking=no' 
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/trixie_upgrade.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no' 
                 
                 """
             }
diff --git a/Jenkinsfile.update-endpoint b/Jenkinsfile.update-endpoint
index 36afc9f..f55f99a 100644
--- a/Jenkinsfile.update-endpoint
+++ b/Jenkinsfile.update-endpoint
@@ -41,8 +41,8 @@ pipeline {
 
                 cd /var/jenkins_home/ansible
 
-                ansible-playbook -i \$inventory_file \
-                    /var/jenkins_home/ansible/playbooks/update-endpoint.yaml --ssh-common-args='-o StrictHostKeyChecking=no'
+                ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/update-endpoint.yaml \
+                    --ssh-common-args='-o StrictHostKeyChecking=no'
                 
                 """
             }
diff --git a/Jenkinsfile.vm_party b/Jenkinsfile.vm_party
index 1d3a059..33e8a7e 100644
--- a/Jenkinsfile.vm_party
+++ b/Jenkinsfile.vm_party
@@ -70,11 +70,12 @@ pipeline {
                     cd /var/jenkins_home/ansible
 
                     ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/vm_party.yaml \
-                    --ssh-common-args='-o StrictHostKeyChecking=no' --extra-vars \
-                    "new_hostname=${params.new_hostname} matt_public_key='${env.matt_public_key}' \
-                    cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
-                    STAGE_TWO_HASH=${env.STAGE_TWO_HASH} update_party=${params.update_party} run_stage_two=false \
-                    vm_party_username_password=${env.vm_party_username_password} autologin=${params.autologin} service_only=${params.service_only} "
+                        --ssh-common-args='-o StrictHostKeyChecking=no' \
+                        --extra-vars "new_hostname=${params.new_hostname} matt_public_key='${env.matt_public_key}' \
+                                      cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
+                                      STAGE_TWO_HASH=${env.STAGE_TWO_HASH} update_party=${params.update_party} \
+                                      run_stage_two=false vm_party_username_password=${env.vm_party_username_password} \
+                                      autologin=${params.autologin} service_only=${params.service_only} "
                     """
             }
         }
@@ -122,8 +123,9 @@ pipeline {
                 cd /var/jenkins_home/ansible
 
                 ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/vm_party.yaml \
-                --ssh-common-args='-o StrictHostKeyChecking=no' --extra-vars \
-                " run_stage_two=true vm_party_username_password=${env.vm_party_username_password} service_only=${params.service_only} "
+                    --ssh-common-args='-o StrictHostKeyChecking=no' \
+                    --extra-vars "run_stage_two=true vm_party_username_password=${env.vm_party_username_password} \
+                                  service_only=${params.service_only} "
                 
                 """
             }