diff --git a/Jenkinsfile.cosmos-server b/Jenkinsfile.cosmos-server
index 9ae77ad..74b0d93 100644
--- a/Jenkinsfile.cosmos-server
+++ b/Jenkinsfile.cosmos-server
@@ -11,7 +11,7 @@ pipeline {
         booleanParam(name: 'install_docker', defaultValue: true, description: 'When checked docker packages are installed and portainer started on 9100')
         booleanParam(name: 'install_LDAP', defaultValue: false, description: 'When checked LDAP integration is installed with NSLCD')
         // this now needs to have the case sensitive name of the role to run
-        choice(name: 'special_server', choices: ['none', 'octoprint', 'kodi', 'timelapse', 'pxe_server', 'jenkins_vpn', 'net_bridge', 'carputer', 'video_capture', 'vcr_client', 'vcr_server'], description: 'Choose special server install if desired')
+        choice(name: 'special_server', choices: ['none', 'octoprint', 'kodi', 'timelapse', 'pxe_server', 'jenkins_vpn', 'net_bridge', 'carputer', 'video_capture', 'vcr_client', 'vcr_server', 'ssd_health', 'gpo_site'], description: 'Choose special server install if desired')
         booleanParam(name: 'refresh_special', defaultValue: false, description: 'When checked only the special server step is run')
         booleanParam(name: 'no_vpn', defaultValue: false, description: 'Check this option to remove default cosmos VPN')
         booleanParam(name: 'public_deploy', defaultValue: true, description: 'Uncheck this option to deploy private SSH key')
@@ -28,6 +28,7 @@ pipeline {
         ANSIBLE_FORCE_COLOR = '1'
         SATURN_BEHEMOTH = credentials('SATURN_BEHEMOTH')
         CIFS_CREDENTIALS = credentials("TERRA_BEHEMOTH_SMB")
+        ITMFG_CREDENTIALS = credentials("itmfg_duymatt")
         APPS_LIST = 'cosmos-base'
         LINUX_LDAP_PWD = credentials('LINUX_LDAP')
         pxe_proxy_password = credentials('pxe_proxy_password')
@@ -135,6 +136,7 @@ pipeline {
                     --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} \
+                                  ITMFG_USERNAME=${env.ITMFG_CREDENTIALS_USR} ITMFG_PASSWORD=${env.ITMFG_CREDENTIALS_PSW} \
                                   docker_full=false rename_host=${params.rename_endpoint} onboard_pi=${params.onboard_pi} \
                                   linux_ldap_pwd=${LINUX_LDAP_PWD} install_docker=${params.install_docker} \
                                   install_LDAP=${params.install_LDAP} special_server='${params.special_server}' \
diff --git a/Jenkinsfile.ssd_health b/Jenkinsfile.ssd_health
index 3163e88..610a16f 100644
--- a/Jenkinsfile.ssd_health
+++ b/Jenkinsfile.ssd_health
@@ -4,10 +4,13 @@ pipeline {
     // Define parameters
     parameters {
         string(name: 'host_ip', description: 'Target System Address')
+        booleanParam(name: 'rename_endpoint', defaultValue: true, description: 'Uncheck to skip renaming of endpoint')
+        booleanParam(name: 'install_kiosk', defaultValue: false, description: 'Install chromium kiosk, only run when installing a GUI makes sense')
+        booleanParam(name: 'quick_refresh', defaultValue: false, description: 'Skip some of the slow boring parts')
+        booleanParam(name: 'service_only', defaultValue: false, description: 'No GUI, No Autologin')
         // string(name: 'new_hostname', description: 'Update Hostname')
         // reference for later
         // choice(name: 'DEPLOY_ENV', choices: ['dev', 'staging', 'prod'], description: 'Environment to deploy to')
-        // booleanParam(name: 'rename_host', defaultValue: true, description: 'When checked hostname will be renamed')
         // booleanParam(name: 'config_matt', defaultValue: true, description: 'config matt profile')
     }
 
@@ -17,6 +20,8 @@ pipeline {
         matt_public_key = credentials('matt_public_key')
         matt_private_key = credentials('matt_private_key')
         autologin_password = credentials('cosmos_password')
+        cosmos_password = credentials('cosmos_password')
+        cosmos_root_password = credentials('cosmos_root_password')
     }
 
     options {
@@ -53,9 +58,12 @@ pipeline {
 
                 ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/ssd_health.yaml \
                     --ssh-common-args='-o StrictHostKeyChecking=no'\
-                    --extra-vars "AUTHORIZED_KEY=${AUTHORIZED_KEY} host_ip=${params.host_ip}  \
+                    --extra-vars "AUTHORIZED_KEY=${AUTHORIZED_KEY} host_ip=${params.host_ip} \
                                   matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
-                                  autologin_password=${env.autologin_password} }"
+                                  autologin_password=${env.autologin_password} cosmos_root_password='${env.cosmos_root_password}' \
+                                  cosmos_password='${env.cosmos_password}' install_kiosk=${params.install_kiosk} \
+                                  service_only=${params.service_only} quick_refresh=${params.quick_refresh} \
+                                  rename_endpoint=${params.rename_endpoint} "
                 """
             }
         }
diff --git a/Jenkinsfile.vm_party b/Jenkinsfile.vm_party
index 05ca5cf..38d20a1 100644
--- a/Jenkinsfile.vm_party
+++ b/Jenkinsfile.vm_party
@@ -92,7 +92,7 @@ pipeline {
                     
                     echo "Waiting for reboot"
 
-                    def ip = sh(script: "cat /var/jenkins_home/ansible/.inv/inventory-${env.STAGE_TWO_HASH}.yml | grep host_ip | cut -d ';' -f 2", returnStdout: true).trim()
+                    def ip = sh(script: "cat /var/jenkins_home/ansible/.inv/inventory-${env.STAGE_TWO_HASH}.yml | grep stage_two_ip | cut -d ':' -f 2", returnStdout: true).trim()
                     echo "Detected IP: ${ip}"
                     
                     def timeoutSeconds = 300  // Total timeout: 5 minutes