diff --git a/lucee/lucee.xml.template b/lucee/lucee.xml.template
index 349bf7f..d876bc2 100644
--- a/lucee/lucee.xml.template
+++ b/lucee/lucee.xml.template
@@ -667,6 +667,12 @@ Please review ${installer_installation_log}.</text>
                 <!-- this is needed for linux with 5.4, otherwise the server doesn't finish deploying properly and setting a password fails -->
                 <httpGet>
                     <url>http://127.0.0.1:${tomcatport}/lucee/admin/server.cfm</url>
+                    <ruleList>
+                        <portTest>
+                            <condition>cannot_bind</condition>
+                            <port>${tomcatport}</port>
+                        </portTest>
+                    </ruleList>
                 </httpGet>
                 <!--
                 <httpPost>
@@ -747,6 +753,7 @@ Please review ${installer_installation_log}.</text>
                     <customErrorMessage>${msg(warnings.LuceePostError)}: ${installer_error_message_original}</customErrorMessage>
                     <progressText>Securing Lucee Web Admins</progressText>
                     <actionList>
+                    <!--
                         <xmlFileGet>
                             <attribute>hspw</attribute>
                             <element>/cfLuceeConfiguration</element>
@@ -782,15 +789,16 @@ Please review ${installer_installation_log}.</text>
                                 </portTest>
                             </ruleList>
                         </xmlFileSet>
-
+                    
                         <!-- lucee 6 uses json rather than xml, install builder doesn't support json, so lets drop a password.txt -->
                         <createDirectory>
                             <path>${installdir}/tomcat/lucee-server/context/</path>
                         </createDirectory>
-
+                    -->
                         <writeFile>
                             <path>${installdir}/tomcat/lucee-server/context/password.txt</path>
                             <text>${luceepass}</text>
+                            <!--
                             <ruleList>
                                 <fileExists negate="1">
                                     <!-- other approach, check for .CFConfig.json -->
@@ -798,6 +806,7 @@ Please review ${installer_installation_log}.</text>
                                     <path>${installdir}/tomcat/lucee-server/context/lucee-server.xml</path>
                                 </fileExists>
                             </ruleList>
+                            -->
                         </writeFile>
                     </actionList>
                 </actionGroup>