diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 6b86e255de..26532d78f7 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -84,7 +84,7 @@
             <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>src/main/cli</directory>
+            <directory>${project.build.directory}/cli</directory>
             <includes>
                 <include>*.cli</include>
             </includes>
@@ -107,11 +107,6 @@
             <outputDirectory>bin</outputDirectory>
             <destName>add-user-keycloak.bat</destName>
         </file>
-        <file>
-            <source>${project.build.directory}/cli/default-keycloak-subsys-config.cli</source>
-            <outputDirectory>bin</outputDirectory>
-            <destName>default-keycloak-subsys-config.cli</destName>
-        </file>
     </files>
 
 </assembly>
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 5b8151beaf..b69386d9e3 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -129,6 +129,43 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>merge-cli</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <concat destfile="${project.build.directory}/cli/keycloak-install.cli" force="yes">
+                                    <fileset dir="${project.build.directory}/cli">
+                                        <include name="keycloak-install-base.cli"/>
+                                    </fileset>
+                                    <fileset dir="${project.build.directory}/cli">
+                                        <include name="default-keycloak-subsys-config.cli"/>
+                                    </fileset>
+                                </concat>
+                                <concat destfile="${project.build.directory}/cli/keycloak-install-ha.cli" force="yes">
+                                    <fileset dir="${project.build.directory}/cli">
+                                        <include name="keycloak-install-ha-base.cli"/>
+                                    </fileset>
+                                    <fileset dir="${project.build.directory}/cli">
+                                        <include name="default-keycloak-subsys-config.cli"/>
+                                    </fileset>
+                                </concat>
+                                <delete file="${project.build.directory}/cli/default-keycloak-subsys-config.cli"/>
+                                <delete file="${project.build.directory}/cli/keycloak-install-base.cli"/>
+                                <delete file="${project.build.directory}/cli/keycloak-install-ha-base.cli"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/distribution/server-overlay/src/main/cli/keycloak-install.cli b/distribution/server-overlay/src/main/cli/keycloak-install-base.cli
similarity index 97%
rename from distribution/server-overlay/src/main/cli/keycloak-install.cli
rename to distribution/server-overlay/src/main/cli/keycloak-install-base.cli
index 835320d9de..63b6a20ef7 100644
--- a/distribution/server-overlay/src/main/cli/keycloak-install.cli
+++ b/distribution/server-overlay/src/main/cli/keycloak-install-base.cli
@@ -15,4 +15,3 @@ embed-server --server-config=standalone.xml
 /subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU)
 /subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000)
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
-run-batch --file=default-keycloak-subsys-config.cli
\ No newline at end of file
diff --git a/distribution/server-overlay/src/main/cli/keycloak-install-ha.cli b/distribution/server-overlay/src/main/cli/keycloak-install-ha-base.cli
similarity index 97%
rename from distribution/server-overlay/src/main/cli/keycloak-install-ha.cli
rename to distribution/server-overlay/src/main/cli/keycloak-install-ha-base.cli
index b7f2631198..6199b1403a 100644
--- a/distribution/server-overlay/src/main/cli/keycloak-install-ha.cli
+++ b/distribution/server-overlay/src/main/cli/keycloak-install-ha-base.cli
@@ -15,4 +15,3 @@ embed-server --server-config=standalone-ha.xml
 /subsystem=infinispan/cache-container=keycloak/local-cache=keys/eviction=EVICTION:add(max-entries=1000,strategy=LRU)
 /subsystem=infinispan/cache-container=keycloak/local-cache=keys/expiration=EXPIRATION:add(max-idle=3600000)
 /extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
-run-batch --file=default-keycloak-subsys-config.cli