From 5d6c1dbd8b5061670323e22ab9fe3ce87b92b672 Mon Sep 17 00:00:00 2001
From: Default User <default@email.com>
Date: Thu, 7 Sep 2023 20:02:14 +0800
Subject: [PATCH] NZOREG-153: Cleaned up group step "Create Windows Server 2022
 UEFI Kickstart with 2 ISOs (link)".

---
 ...Windows-Desktop-10-on-macOS-Parallels.html |  55 +++-
 ...indows-Server-2019-on-macOS-Parallels.html |  55 +++-
 ...indows-Server-2022-on-macOS-Parallels.html | 235 +-----------------
 .../metadata.json                             |   4 +-
 .../metadata.json                             |  52 ++++
 .../README.md                                 |   0
 .../metadata.json                             |   4 +-
 .../metadata.json                             |   6 +-
 .../metadata.json                             |   6 +-
 .../metadata.json                             |  20 +-
 10 files changed, 173 insertions(+), 264 deletions(-)
 create mode 100644 steps/createwindowsserver2022uefikickstartwith2isoslink/metadata.json
 rename steps/{deploywindowsserver2022isolink => deploywindowsserver2022isolinkdelete}/README.md (100%)
 rename steps/{deploywindowsserver2022isolink => deploywindowsserver2022isolinkdelete}/metadata.json (93%)

diff --git a/docs/Kickstart-Windows-Desktop-10-on-macOS-Parallels.html b/docs/Kickstart-Windows-Desktop-10-on-macOS-Parallels.html
index 4d762d3..1bb4631 100644
--- a/docs/Kickstart-Windows-Desktop-10-on-macOS-Parallels.html
+++ b/docs/Kickstart-Windows-Desktop-10-on-macOS-Parallels.html
@@ -213,9 +213,17 @@ <h6 class="text-right">
 
         
 
+                    <p class="text-muted pt-2">
+                        <a href="#kscleanbuildfileslink">
+                            <strong>Step 2 -</strong> KS Clean Build Files (link)
+                        </a>
+                    </p>
+
+        
+
                     <p class="text-muted pt-2">
                         <a href="#ksdeployparallelsdriverslink">
-                            <strong>Step 2 -</strong> KS Deploy Parallels Drivers (link)
+                            <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                         </a>
                     </p>
 
@@ -223,7 +231,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#createwindowsdesktop10uefikickstartisowith2isoslink">
-                            <strong>Step 3 -</strong> Create Windows Desktop 10 UEFI Kickstart ISO with 2 ISOs (link)
+                            <strong>Step 4 -</strong> Create Windows Desktop 10 UEFI Kickstart ISO with 2 ISOs (link)
                         </a>
                     </p>
 
@@ -231,7 +239,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                            <strong>Step 4 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                            <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                         </a>
                     </p>
 
@@ -239,7 +247,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#kscleanbuildfileslink">
-                            <strong>Step 5 -</strong> KS Clean Build Files (link)
+                            <strong>Step 6 -</strong> KS Clean Build Files (link)
                         </a>
                     </p>
 
@@ -363,10 +371,41 @@ <h3 id="kscheckmacosforisobuildinglink">
 
 
 
+                    <div class="row pt-5">
+                        <h3 id="kscleanbuildfileslink">
+                            <a href="#kscleanbuildfileslink">
+                                <strong>Step 2 -</strong> KS Clean Build Files (link)
+                            </a>
+                        </h3>
+                    </div>
+
+                    <div class="row">
+                        <div class="description col px-0">
+                            <p>
+                                <p>Deletes the build files and kickstart ISO.</p>
+                            </p>
+                        </div>
+                    </div>
+
+
+
+
+
+
+    
+
+
+
+
+
+        
+
+
+
                     <div class="row pt-5">
                         <h3 id="ksdeployparallelsdriverslink">
                             <a href="#ksdeployparallelsdriverslink">
-                                <strong>Step 2 -</strong> KS Deploy Parallels Drivers (link)
+                                <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                             </a>
                         </h3>
                     </div>
@@ -398,7 +437,7 @@ <h3 id="ksdeployparallelsdriverslink">
                     <div class="row pt-5">
                         <h3 id="createwindowsdesktop10uefikickstartisowith2isoslink">
                             <a href="#createwindowsdesktop10uefikickstartisowith2isoslink">
-                                <strong>Step 3 -</strong> Create Windows Desktop 10 UEFI Kickstart ISO with 2 ISOs (link)
+                                <strong>Step 4 -</strong> Create Windows Desktop 10 UEFI Kickstart ISO with 2 ISOs (link)
                             </a>
                         </h3>
                     </div>
@@ -429,7 +468,7 @@ <h3 id="createwindowsdesktop10uefikickstartisowith2isoslink">
                     <div class="row pt-5">
                         <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                             <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                                <strong>Step 4 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                                <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                             </a>
                         </h3>
                     </div>
@@ -460,7 +499,7 @@ <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                     <div class="row pt-5">
                         <h3 id="kscleanbuildfileslink">
                             <a href="#kscleanbuildfileslink">
-                                <strong>Step 5 -</strong> KS Clean Build Files (link)
+                                <strong>Step 6 -</strong> KS Clean Build Files (link)
                             </a>
                         </h3>
                     </div>
diff --git a/docs/Kickstart-Windows-Server-2019-on-macOS-Parallels.html b/docs/Kickstart-Windows-Server-2019-on-macOS-Parallels.html
index e87e51e..a993cfe 100644
--- a/docs/Kickstart-Windows-Server-2019-on-macOS-Parallels.html
+++ b/docs/Kickstart-Windows-Server-2019-on-macOS-Parallels.html
@@ -213,9 +213,17 @@ <h6 class="text-right">
 
         
 
+                    <p class="text-muted pt-2">
+                        <a href="#kscleanbuildfileslink">
+                            <strong>Step 2 -</strong> KS Clean Build Files (link)
+                        </a>
+                    </p>
+
+        
+
                     <p class="text-muted pt-2">
                         <a href="#ksdeployparallelsdriverslink">
-                            <strong>Step 2 -</strong> KS Deploy Parallels Drivers (link)
+                            <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                         </a>
                     </p>
 
@@ -223,7 +231,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#createwindowsserver2019uefikickstartwith2isoslink">
-                            <strong>Step 3 -</strong> Create Windows Server 2019 UEFI Kickstart with 2 ISOs (link)
+                            <strong>Step 4 -</strong> Create Windows Server 2019 UEFI Kickstart with 2 ISOs (link)
                         </a>
                     </p>
 
@@ -231,7 +239,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                            <strong>Step 4 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                            <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                         </a>
                     </p>
 
@@ -239,7 +247,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#kscleanbuildfileslink">
-                            <strong>Step 5 -</strong> KS Clean Build Files (link)
+                            <strong>Step 6 -</strong> KS Clean Build Files (link)
                         </a>
                     </p>
 
@@ -363,10 +371,41 @@ <h3 id="kscheckmacosforisobuildinglink">
 
 
 
+                    <div class="row pt-5">
+                        <h3 id="kscleanbuildfileslink">
+                            <a href="#kscleanbuildfileslink">
+                                <strong>Step 2 -</strong> KS Clean Build Files (link)
+                            </a>
+                        </h3>
+                    </div>
+
+                    <div class="row">
+                        <div class="description col px-0">
+                            <p>
+                                <p>Deletes the build files and kickstart ISO.</p>
+                            </p>
+                        </div>
+                    </div>
+
+
+
+
+
+
+    
+
+
+
+
+
+        
+
+
+
                     <div class="row pt-5">
                         <h3 id="ksdeployparallelsdriverslink">
                             <a href="#ksdeployparallelsdriverslink">
-                                <strong>Step 2 -</strong> KS Deploy Parallels Drivers (link)
+                                <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                             </a>
                         </h3>
                     </div>
@@ -398,7 +437,7 @@ <h3 id="ksdeployparallelsdriverslink">
                     <div class="row pt-5">
                         <h3 id="createwindowsserver2019uefikickstartwith2isoslink">
                             <a href="#createwindowsserver2019uefikickstartwith2isoslink">
-                                <strong>Step 3 -</strong> Create Windows Server 2019 UEFI Kickstart with 2 ISOs (link)
+                                <strong>Step 4 -</strong> Create Windows Server 2019 UEFI Kickstart with 2 ISOs (link)
                             </a>
                         </h3>
                     </div>
@@ -422,7 +461,7 @@ <h3 id="createwindowsserver2019uefikickstartwith2isoslink">
                     <div class="row pt-5">
                         <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                             <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                                <strong>Step 4 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                                <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                             </a>
                         </h3>
                     </div>
@@ -453,7 +492,7 @@ <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                     <div class="row pt-5">
                         <h3 id="kscleanbuildfileslink">
                             <a href="#kscleanbuildfileslink">
-                                <strong>Step 5 -</strong> KS Clean Build Files (link)
+                                <strong>Step 6 -</strong> KS Clean Build Files (link)
                             </a>
                         </h3>
                     </div>
diff --git a/docs/Kickstart-Windows-Server-2022-on-macOS-Parallels.html b/docs/Kickstart-Windows-Server-2022-on-macOS-Parallels.html
index 4b47701..bc16bc6 100644
--- a/docs/Kickstart-Windows-Server-2022-on-macOS-Parallels.html
+++ b/docs/Kickstart-Windows-Server-2022-on-macOS-Parallels.html
@@ -221,49 +221,17 @@ <h6 class="text-right">
 
         
 
-                    <p class="text-muted pt-2">
-                        <a href="#deploywindowsserver2022isolink">
-                            <strong>Step 3 -</strong> Deploy Windows Server 2022 ISO (link)
-                        </a>
-                    </p>
-
-        
-
-                    <p class="text-muted pt-2">
-                        <a href="#renameisodelete">
-                            <strong>Step 4 -</strong> Rename ISO - DELETE
-                        </a>
-                    </p>
-
-        
-
-                    <p class="text-muted pt-2">
-                        <a href="#deploywindowsserverunattendedconfigforparallelslinkdelete">
-                            <strong>Step 5 -</strong> Deploy Windows Server Unattended Config for Parallels (link) - DELETE
-                        </a>
-                    </p>
-
-        
-
                     <p class="text-muted pt-2">
                         <a href="#ksdeployparallelsdriverslink">
-                            <strong>Step 6 -</strong> KS Deploy Parallels Drivers (link)
-                        </a>
-                    </p>
-
-        
-
-                    <p class="text-muted pt-2">
-                        <a href="#lindeploycustomsetupps1scriptlinkdelete">
-                            <strong>Step 7 -</strong> LIN Deploy Custom Setup PS1 Script (link) - DELETE
+                            <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                         </a>
                     </p>
 
         
 
                     <p class="text-muted pt-2">
-                        <a href="#kscreatedriversandanswerfileisoforparallelslinkdelete">
-                            <strong>Step 8 -</strong> KS Create Drivers and Answer File ISO for Parallels (link) - DELETE
+                        <a href="#createwindowsserver2022uefikickstartwith2isoslink">
+                            <strong>Step 4 -</strong> Create Windows Server 2022 UEFI Kickstart with 2 ISOs (link)
                         </a>
                     </p>
 
@@ -271,7 +239,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                            <strong>Step 9 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                            <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                         </a>
                     </p>
 
@@ -279,7 +247,7 @@ <h6 class="text-right">
 
                     <p class="text-muted pt-2">
                         <a href="#kscleanbuildfileslink">
-                            <strong>Step 10 -</strong> KS Clean Build Files (link)
+                            <strong>Step 6 -</strong> KS Clean Build Files (link)
                         </a>
                     </p>
 
@@ -434,144 +402,10 @@ <h3 id="kscleanbuildfileslink">
 
 
 
-                    <div class="row pt-5">
-                        <h3 id="deploywindowsserver2022isolink">
-                            <a href="#deploywindowsserver2022isolink">
-                                <strong>Step 3 -</strong> Deploy Windows Server 2022 ISO (link)
-                            </a>
-                        </h3>
-                    </div>
-
-                    <div class="row">
-                        <div class="description col px-0">
-                            <p>
-                                <p>Deploys Windows Server 2022 ISO to <code>${HOME}/Parallels/os_auto_install//build-{kickstartedNode.fqn}</code>.</p>
-                            </p>
-                        </div>
-                    </div>
-
-
-
-
-
-
-    
-
-
-
-
-
-        
-
-
-
-                    <div class="row pt-5">
-                        <h3 id="renameisodelete">
-                            <a href="#renameisodelete">
-                                <strong>Step 4 -</strong> Rename ISO - DELETE
-                            </a>
-                        </h3>
-                    </div>
-
-                    <div class="row">
-                        <div class="description col px-0">
-                            <p>
-                                <p>Renames the ISO at directory <code>${HOME}/Parallels/os_auto_install/build-{kickstartedNode.fqn</code> to <code>kickstart.iso</code>.</p>
-                            </p>
-                        </div>
-                    </div>
-
-
-
-
-
-
-
-
-
-
-                        <div class="row">
-                            <p>
-                                Connect via ssh:
-                            </p>
-                        </div>
-                        <div class="row py-1">
-                            <code class="language-sql">
-ssh {macoshostuser}@{macoshost}
-                            </code>
-                        </div>
-
-
-
-    
-
-
-
-    <div class="row">
-        <p>
-            Execute the following script:
-        </p>
-    </div>
-    <div class="row">
-        <div class="col px-0">
-            <pre>
-                <code class="language-sql py-0">
-cd &quot;${HOME}/Parallels/os_auto_install/build-{kickstartedNode.fqn}&quot;
-mv -v $(ls) kickstart.iso
-                </code>
-            </pre>
-        </div>
-    </div>
-
-
-
-
-
-        
-
-
-
-                    <div class="row pt-5">
-                        <h3 id="deploywindowsserverunattendedconfigforparallelslinkdelete">
-                            <a href="#deploywindowsserverunattendedconfigforparallelslinkdelete">
-                                <strong>Step 5 -</strong> Deploy Windows Server Unattended Config for Parallels (link) - DELETE
-                            </a>
-                        </h3>
-                    </div>
-
-                    <div class="row">
-                        <div class="description col px-0">
-                            <p>
-                                <p>Deploys the Windows Server 2019 unattended config for Parallels Desktop.</p>
-<p>This works for:</p>
-<ol>
-<li>Windows Server 2016</li>
-<li>Windows Server 2019</li>
-<li>Windows Server 2022</li>
-</ol>
-                            </p>
-                        </div>
-                    </div>
-
-
-
-
-
-
-    
-
-
-
-
-
-        
-
-
-
                     <div class="row pt-5">
                         <h3 id="ksdeployparallelsdriverslink">
                             <a href="#ksdeployparallelsdriverslink">
-                                <strong>Step 6 -</strong> KS Deploy Parallels Drivers (link)
+                                <strong>Step 3 -</strong> KS Deploy Parallels Drivers (link)
                             </a>
                         </h3>
                     </div>
@@ -601,60 +435,13 @@ <h3 id="ksdeployparallelsdriverslink">
 
 
                     <div class="row pt-5">
-                        <h3 id="lindeploycustomsetupps1scriptlinkdelete">
-                            <a href="#lindeploycustomsetupps1scriptlinkdelete">
-                                <strong>Step 7 -</strong> LIN Deploy Custom Setup PS1 Script (link) - DELETE
+                        <h3 id="createwindowsserver2022uefikickstartwith2isoslink">
+                            <a href="#createwindowsserver2022uefikickstartwith2isoslink">
+                                <strong>Step 4 -</strong> Create Windows Server 2022 UEFI Kickstart with 2 ISOs (link)
                             </a>
                         </h3>
                     </div>
 
-                    <div class="row">
-                        <div class="description col px-0">
-                            <p>
-                                <p>Deploys the custom run once PowerShell scripts.</p>
-                            </p>
-                        </div>
-                    </div>
-
-
-
-
-
-
-    
-
-
-
-
-
-        
-
-
-
-                    <div class="row pt-5">
-                        <h3 id="kscreatedriversandanswerfileisoforparallelslinkdelete">
-                            <a href="#kscreatedriversandanswerfileisoforparallelslinkdelete">
-                                <strong>Step 8 -</strong> KS Create Drivers and Answer File ISO for Parallels (link) - DELETE
-                            </a>
-                        </h3>
-                    </div>
-
-                    <div class="row">
-                        <div class="description col px-0">
-                            <p>
-                                <p>Creates an ISO called <code>Drivers.iso</code> containing:</p>
-<ol>
-<li>The <code>Drivers</code> folder.</li>
-<li><code>Autounattend.xml</code></li>
-<li><code>custom_setup.ps1</code></li>
-</ol>
-<p>This works for Parallels Desktop kickstarts with:
-1. Windows Desktop 10
-2. Windows Server 2019
-3. Windows Server 2022</p>
-                            </p>
-                        </div>
-                    </div>
 
 
 
@@ -674,7 +461,7 @@ <h3 id="kscreatedriversandanswerfileisoforparallelslinkdelete">
                     <div class="row pt-5">
                         <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                             <a href="#parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
-                                <strong>Step 9 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
+                                <strong>Step 5 -</strong> Parallels Recreate Windows Virtual Machine and Install Tools (link)
                             </a>
                         </h3>
                     </div>
@@ -705,7 +492,7 @@ <h3 id="parallelsrecreatewindowsvirtualmachineandinstalltoolslink">
                     <div class="row pt-5">
                         <h3 id="kscleanbuildfileslink">
                             <a href="#kscleanbuildfileslink">
-                                <strong>Step 10 -</strong> KS Clean Build Files (link)
+                                <strong>Step 6 -</strong> KS Clean Build Files (link)
                             </a>
                         </h3>
                     </div>
diff --git a/steps/createwindowsserver2019uefikickstartwith2isoslink/metadata.json b/steps/createwindowsserver2019uefikickstartwith2isoslink/metadata.json
index fe9bc2c..3472a0a 100644
--- a/steps/createwindowsserver2019uefikickstartwith2isoslink/metadata.json
+++ b/steps/createwindowsserver2019uefikickstartwith2isoslink/metadata.json
@@ -38,11 +38,11 @@
         {
             "childParameterName": null, 
             "childParameterType": "c.s.s.b.phv.Text", 
-            "childParameterUuid": "27cbd06c-9a60-48ed-b8d0-bd0d34dbe544", 
+            "childParameterUuid": "5501c810-9dcc-4c54-9568-91375ef2f7c5", 
             "childProjectName": null, 
             "childProjectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
             "parentParameterKey": null, 
-            "parentStaticTextValue": "${HOME}/Parallels/os_auto_install/"
+            "parentStaticTextValue": "E:\\Drivers"
         }
     ], 
     "projectName": "", 
diff --git a/steps/createwindowsserver2022uefikickstartwith2isoslink/metadata.json b/steps/createwindowsserver2022uefikickstartwith2isoslink/metadata.json
new file mode 100644
index 0000000..d5d1056
--- /dev/null
+++ b/steps/createwindowsserver2022uefikickstartwith2isoslink/metadata.json
@@ -0,0 +1,52 @@
+{
+    "actionOnStepFail": null, 
+    "blueprintName": "", 
+    "blueprintUuid": "33f4759c-cdcb-469a-a79a-186fb6494e32", 
+    "cloneUrl": "", 
+    "enabled": true, 
+    "externalUuid4": "56772d9e-3c0b-43d3-a926-152b535196b7", 
+    "key": "createwindowsserver2022uefikickstartwith2isoslink", 
+    "name": "Create Windows Server 2022 UEFI Kickstart with 2 ISOs (link)", 
+    "parameterMap": [
+        {
+            "childParameterName": null, 
+            "childParameterType": "c.s.s.b.phv.Text", 
+            "childParameterUuid": "27cbd06c-9a60-48ed-b8d0-bd0d34dbe544", 
+            "childProjectName": null, 
+            "childProjectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
+            "parentParameterKey": null, 
+            "parentStaticTextValue": "${HOME}/Parallels/os_auto_install"
+        }, 
+        {
+            "childParameterName": null, 
+            "childParameterType": "c.s.s.b.phv.LinuxServer", 
+            "childParameterUuid": "6adef4f6-9180-4ab1-95e7-486de103f1fd", 
+            "childProjectName": null, 
+            "childProjectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
+            "parentParameterKey": "macoshost", 
+            "parentStaticTextValue": null
+        }, 
+        {
+            "childParameterName": null, 
+            "childParameterType": "c.s.s.b.phv.LinOsCred", 
+            "childParameterUuid": "7a64ee22-768c-411b-8aee-fb482908f6fb", 
+            "childProjectName": null, 
+            "childProjectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
+            "parentParameterKey": "macoshostuser", 
+            "parentStaticTextValue": null
+        }, 
+        {
+            "childParameterName": null, 
+            "childParameterType": "c.s.s.b.phv.Text", 
+            "childParameterUuid": "5501c810-9dcc-4c54-9568-91375ef2f7c5", 
+            "childProjectName": null, 
+            "childProjectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
+            "parentParameterKey": null, 
+            "parentStaticTextValue": "E:\\Drivers"
+        }
+    ], 
+    "projectName": "", 
+    "projectUuid": "24a458c3-5025-400b-bb49-4eae2055a149", 
+    "projectVersion": "", 
+    "type": "com.servertribe.attune.tuples.StepProjectLinkTuple"
+}
\ No newline at end of file
diff --git a/steps/deploywindowsserver2022isolink/README.md b/steps/deploywindowsserver2022isolinkdelete/README.md
similarity index 100%
rename from steps/deploywindowsserver2022isolink/README.md
rename to steps/deploywindowsserver2022isolinkdelete/README.md
diff --git a/steps/deploywindowsserver2022isolink/metadata.json b/steps/deploywindowsserver2022isolinkdelete/metadata.json
similarity index 93%
rename from steps/deploywindowsserver2022isolink/metadata.json
rename to steps/deploywindowsserver2022isolinkdelete/metadata.json
index 1945720..b34575c 100644
--- a/steps/deploywindowsserver2022isolink/metadata.json
+++ b/steps/deploywindowsserver2022isolinkdelete/metadata.json
@@ -5,8 +5,8 @@
     "cloneUrl": "", 
     "enabled": true, 
     "externalUuid4": "6cd80754-37d0-4513-81fe-e99b56d2ba51", 
-    "key": "deploywindowsserver2022isolink", 
-    "name": "Deploy Windows Server 2022 ISO (link)", 
+    "key": "deploywindowsserver2022isolinkdelete", 
+    "name": "Deploy Windows Server 2022 ISO (link) - DELETE", 
     "parameterMap": [
         {
             "childParameterName": null, 
diff --git a/steps/kickstartwindowsdesktop10onmacosparallels/metadata.json b/steps/kickstartwindowsdesktop10onmacosparallels/metadata.json
index 62bf041..6e092c7 100644
--- a/steps/kickstartwindowsdesktop10onmacosparallels/metadata.json
+++ b/steps/kickstartwindowsdesktop10onmacosparallels/metadata.json
@@ -12,10 +12,14 @@
         }, 
         {
             "order": 50, 
-            "stepKey": "ksdeployparallelsdriverslink"
+            "stepKey": "kscleanbuildfileslink"
         }, 
         {
             "order": 100, 
+            "stepKey": "ksdeployparallelsdriverslink"
+        }, 
+        {
+            "order": 150, 
             "stepKey": "createwindowsdesktop10uefikickstartisowith2isoslink"
         }, 
         {
diff --git a/steps/kickstartwindowsserver2019onmacosparallels/metadata.json b/steps/kickstartwindowsserver2019onmacosparallels/metadata.json
index c0aa7ae..1be6214 100644
--- a/steps/kickstartwindowsserver2019onmacosparallels/metadata.json
+++ b/steps/kickstartwindowsserver2019onmacosparallels/metadata.json
@@ -12,10 +12,14 @@
         }, 
         {
             "order": 50, 
-            "stepKey": "ksdeployparallelsdriverslink"
+            "stepKey": "kscleanbuildfileslink"
         }, 
         {
             "order": 100, 
+            "stepKey": "ksdeployparallelsdriverslink"
+        }, 
+        {
+            "order": 150, 
             "stepKey": "createwindowsserver2019uefikickstartwith2isoslink"
         }, 
         {
diff --git a/steps/kickstartwindowsserver2022onmacosparallels/metadata.json b/steps/kickstartwindowsserver2022onmacosparallels/metadata.json
index 245647a..d858625 100644
--- a/steps/kickstartwindowsserver2022onmacosparallels/metadata.json
+++ b/steps/kickstartwindowsserver2022onmacosparallels/metadata.json
@@ -16,27 +16,11 @@
         }, 
         {
             "order": 100, 
-            "stepKey": "deploywindowsserver2022isolink"
-        }, 
-        {
-            "order": 150, 
-            "stepKey": "renameisodelete"
-        }, 
-        {
-            "order": 250, 
-            "stepKey": "deploywindowsserverunattendedconfigforparallelslinkdelete"
-        }, 
-        {
-            "order": 300, 
             "stepKey": "ksdeployparallelsdriverslink"
         }, 
         {
-            "order": 350, 
-            "stepKey": "lindeploycustomsetupps1scriptlinkdelete"
-        }, 
-        {
-            "order": 400, 
-            "stepKey": "kscreatedriversandanswerfileisoforparallelslinkdelete"
+            "order": 150, 
+            "stepKey": "createwindowsserver2022uefikickstartwith2isoslink"
         }, 
         {
             "order": 450,