diff --git a/core-feature-pack/common/assembly.xml b/core-feature-pack/common/assembly.xml
index e832025d72b..f9428205cc8 100644
--- a/core-feature-pack/common/assembly.xml
+++ b/core-feature-pack/common/assembly.xml
@@ -16,6 +16,10 @@
             <directory>src/main/resources</directory>
             <outputDirectory/>
         </fileSet>
+        <fileSet>
+            <directory>target/resources</directory>
+            <outputDirectory/>
+        </fileSet>
     </fileSets>
     <files>
         <file>
diff --git a/core-feature-pack/common/pom.xml b/core-feature-pack/common/pom.xml
index b96e11ffbd4..6763044329b 100644
--- a/core-feature-pack/common/pom.xml
+++ b/core-feature-pack/common/pom.xml
@@ -29,6 +29,13 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
+            <classifier>bin-windows</classifier>
+            <type>zip</type>
+        </dependency>
+
         <!-- Dependency for JSonP API and Impl for Jakarta EE 8. We still need this artifact for
              internal.javax.json.api.ee8 Jboss module used by org.wildfly.event.logger and
              org.jboss.logmanager JBoss modules
@@ -864,6 +871,44 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>commons-daemon</groupId>
+                                    <artifactId>commons-daemon</artifactId>
+                                    <version>${version.commons-daemon}</version>
+                                    <classifier>bin-windows</classifier>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/resources/content/docs/contrib/scripts/service/</outputDirectory>
+                                    <includes>**/*.exe</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                          <pattern>prunsrv</pattern>
+                                          <replacement>wildfly-service</replacement>
+                                        </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                        <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                          <pattern>prunmgr</pattern>
+                                          <replacement>wildfly-mgr</replacement>
+                                        </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                      </fileMappers>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/amd64/wildfly-service.exe b/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/amd64/wildfly-service.exe
deleted file mode 100644
index ab9747e3606..00000000000
Binary files a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/amd64/wildfly-service.exe and /dev/null differ
diff --git a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/service.bat b/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/service.bat
index f1e301052ab..bd6d85a1b29 100644
--- a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/service.bat
+++ b/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/service.bat
@@ -112,8 +112,7 @@ if "%DEBUG%" == "1" (
 echo(
 
 rem defaults
-set SHORTNAME=Wildfly
-rem NO quotes around the display name here !
+set SHORTNAME=WildFly
 set DISPLAYNAME=WildFly
 rem NO quotes around the description here !
 set DESCRIPTION=WildFly Application Server
@@ -403,7 +402,7 @@ if not "%JBOSSUSER%" == "" (
   set "CREDENTIALS=--user=%JBOSSUSER% --password='!JBOSSPASS!'"
 )
 
-set RUNAS=
+set "RUNAS=--ServiceUser=LocalSystem"
 if not "%SERVICE_USER%" == "" (
   if "%SERVICE_PASS%" == "" (
     echo When specifying a user, you need to specify the password
@@ -453,7 +452,7 @@ if not exist "%BASE%\configuration\%CONFIG%" (
 
 if /I "%ISDEBUG%" == "true" (
   echo JBOSS_HOME="%JBOSS_HOME%"
-  echo RUNAS=%RUNAS%
+  echo RUNAS=!RUNAS!
   echo SHORTNAME="%SHORTNAME%"
   echo DISPLAYNAME="%DISPLAYNAME%"
   echo DESCRIPTION="%DESCRIPTION%"
@@ -476,8 +475,8 @@ if /I "%ISDEBUG%" == "true" (
 )
 
 @rem quotes around the "%DESCRIPTION%" and "%DISPLAYNAME" but nowhere else
-echo %PRUNSRV% install %SHORTNAME% %RUNAS% --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%"  ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH%  ++StopParams=!STOPPARAM!
-%PRUNSRV% install %SHORTNAME% %RUNAS% --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%"  ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH%  ++StopParams=!STOPPARAM!
+echo %PRUNSRV% install %SHORTNAME% !RUNAS! --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%"  ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH%  ++StopParams=!STOPPARAM!
+%PRUNSRV% install %SHORTNAME% !RUNAS! --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%"  ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH%  ++StopParams=!STOPPARAM!
 
 @if /I "%ISDEBUG%" == "true" (
   @echo off
diff --git a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-mgr.exe b/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-mgr.exe
deleted file mode 100644
index 08ebb760c9e..00000000000
Binary files a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-mgr.exe and /dev/null differ
diff --git a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-service.exe b/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-service.exe
deleted file mode 100644
index 5bc3424f8b9..00000000000
Binary files a/core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-service.exe and /dev/null differ
diff --git a/core-feature-pack/galleon-feature-pack/pom.xml b/core-feature-pack/galleon-feature-pack/pom.xml
index 2e27d9f60e3..0b13e4d12c2 100644
--- a/core-feature-pack/galleon-feature-pack/pom.xml
+++ b/core-feature-pack/galleon-feature-pack/pom.xml
@@ -78,6 +78,44 @@
     <build>
         <finalName>${server.output.dir.prefix}-galleon-pack-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>commons-daemon</groupId>
+                                    <artifactId>commons-daemon</artifactId>
+                                    <version>${version.commons-daemon}</version>
+                                    <classifier>bin-windows</classifier>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/resources/content/docs/contrib/scripts/service/</outputDirectory>
+                                    <includes>**/*.exe</includes>
+                                    <fileMappers>
+                                        <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                          <pattern>prunsrv</pattern>
+                                          <replacement>wildfly-service</replacement>
+                                        </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                        <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                          <pattern>prunmgr</pattern>
+                                          <replacement>wildfly-mgr</replacement>
+                                        </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+                                      </fileMappers>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 9e1c9dad8ff..32598a94cb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,7 @@
         <version.com.jcraft.jsch>0.1.55</version.com.jcraft.jsch>
         <version.commons-cli>1.5.0</version.commons-cli>
         <version.commons-collections>3.2.2</version.commons-collections>
+        <version.commons-daemon>1.3.4</version.commons-daemon>
         <version.commons-lang3>3.12.0</version.commons-lang3>
         <version.commons-io>2.10.0</version.commons-io>
         <version.io.netty>4.1.100.Final</version.io.netty>
@@ -700,6 +701,13 @@
                 <artifactId>commons-cli</artifactId>
                 <version>${version.commons-cli}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-daemon</groupId>
+                <artifactId>commons-daemon</artifactId>
+                <classifier>bin-windows</classifier>
+                <type>zip</type>
+                <version>${version.commons-daemon}</version>
+            </dependency>            
             <dependency>
                 <groupId>io.smallrye</groupId>
                 <artifactId>jandex</artifactId>