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 1b5cc6df2e1..39e930a4708 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/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/pom.xml b/pom.xml
index 4f4bf1d4a5d..fd1088eaa3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
 
         <!-- This overrides default surefire plugin version specified in parent pom - reason is to enable TCP/IP communication,
              see https://maven.apache.org/surefire/maven-surefire-plugin/examples/process-communication.html -->
-	<version.surefire.plugin>3.1.2</version.surefire.plugin>
+	    <version.surefire.plugin>3.1.2</version.surefire.plugin>
 
         <!-- Non-default maven plugin versions and configuration -->
         <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
@@ -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.99.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>