diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
index 735b5f267b..496c837b2b 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.bat
@@ -1,7 +1,9 @@
set NOPAUSE=true
call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install.cli
+call %JBOSS_HOME%\bin\jboss-cli.bat --file=keycloak-install-ha.cli
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+
exit /b %ERROR%
diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
index af7cebe0d0..8f952371c1 100755
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/install-keycloak.sh
@@ -10,8 +10,8 @@ cd $JBOSS_HOME/bin
RESULT=0
./jboss-cli.sh --file=keycloak-install.cli
-if [ $? -ne 0 ]; then RESULT=1; fi
- exit $RESULT
-fi
+if [ $? -ne 0 ]; then exit 1; fi
+./jboss-cli.sh --file=keycloak-install-ha.cli
+if [ $? -ne 0 ]; then exit 1; fi
-exit 1
+exit 0
diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
index ab955f2c10..775aa5a0bd 100644
--- a/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/jboss/pom.xml
@@ -100,6 +100,7 @@
${project.build.directory}/unpacked
+ **/product.conf
@@ -309,6 +310,7 @@
${auth.server.overlay.artifactId}
${auth.server.overlay.version}
zip
+ true
${project.build.directory}/unpacked/${overlaid.container.unpacked.folder.name}