diff --git a/Dockerfile b/Dockerfile
index b3950de..95ff822 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,8 +81,10 @@ RUN del c:\TIER_Beacon_Task.xml
 #    therefore, the use a mounted config on windows, those directories must be cleared first
 #
 # need to ensure directories below are empty or non-existent (required by Windows)
-#   There's an apparent issue with Docker and Windows resulting in errors that say "There are no more files" when 'rmdir /S /Q' tries to remove some directories (might try renaming?)
-#
+#   This should do it (via a rename, due to bugs doing deletes):
+#      (for mounted config, uncomment remaining lines in this section)
+#RUN powershell $paths='c:\Tomcat\conf','c:\Tomcat\webapps\ROOT','c:\Tomcat\logs','c:\sslcert','c:\opt\shibboleth-idp\conf','c:\opt\shibboleth-idp\credentials','c:\opt\shibboleth-idp\views','c:\opt\shibboleth-idp\edit-webapp','c:\opt\shibboleth-idp\messages','c:\opt\shibboleth-idp\metadata','c:\opt\shibboleth-idp\logs' ; \
+# Foreach ($path IN $paths) {Rename-Item -Path $path -NewName ((Split-Path $path -leaf) + '.dist') -Force}
 #
 #VOLUME ["c:/Tomcat/conf", \
 #	    "c:/Tomcat/webapps/ROOT", \
@@ -95,6 +97,8 @@ RUN del c:\TIER_Beacon_Task.xml
 #		"c:/opt/shibboleth-idp/messages", \
 #		"c:/opt/shibboleth-idp/metadata", \
 #		"c:/opt/shibboleth-idp/logs"]
+#
+#############################################################################
 
 
 #################################################
@@ -130,9 +134,10 @@ ADD $SHBVIEWS c:\\opt\\shibboleth-idp\\views
 ADD $SHBEDWAPP c:\\opt\\shibboleth-idp\\edit-webapp
 ADD $SHBMSGS c:\\opt\\shibboleth-idp\\messages
 ADD $SHBMD c:\\opt\\shibboleth-idp\\metadata
-
+#
 ###############################################################################
 
+
 EXPOSE 443
 
 CMD [ "cmd /c c:\\Tomcat\\bin\\catalina.bat run" ]