diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml
index 1a0c60066d..a2e48f6d32 100644
--- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml
+++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml
@@ -19,8 +19,6 @@ env:
   TEST_OPENSHIFT: true
   MATRIX_JDK: '"17"'
   MATRIX_OS: '"ubuntu-latest"'
-  SERVER_PROVISIONING_SERVER_HOST: 'http://localhost'
-  EXTRA_RUN_ARGS: '-DpostgresqlUsername="test" -DpostgresqlPassword="test"'
 jobs:
   Matrix-Setup:
     runs-on: ubuntu-latest
@@ -75,26 +73,23 @@ jobs:
           cd ${{ env.QUICKSTART_PATH }}/client
           echo "Building 'client' provisioned server..."
           mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test"
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120
           cd ../server
           echo "Building 'server' provisioned server..."
           mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test"
           mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test"
           echo "Add quickstartUser to both 'server' builds..."
-          ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' 
-          ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
-          echo "Add quickstartAdmin to both 'server' builds..."
-          ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
-          ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' 
+          ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
           echo "Starting provisioned server..."
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}}
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120
           echo "Testing provisioned server..."
           cd ../client
           mvn -fae verify -Pintegration-testing
           cd ../server
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing
+          mvn -fae verify -Dserver.host="http://localhost:8180" -Pintegration-testing
+          mvn -fae verify -Dserver.host="http://localhost:8280" -Pintegration-testing
           echo "Shutting down provisioned server..."
           cd ../client
           mvn wildfly:shutdown
@@ -184,27 +179,23 @@ jobs:
           cd ${{ env.QUICKSTART_PATH }}/client
           echo "Building 'client' provisioned server..."
           mvn -fae clean package -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           cd ../server
           echo "Building 'server' provisioned server..."
           mvn -fae clean package -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           mvn -fae package -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Add quickstartUser to both 'server' builds..."
-          ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
-          ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users'
-          echo "Add quickstartAdmin to both 'server' builds..."
-          ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
-          ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin'
+          ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'
+          ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!'      
           echo "Starting provisioned server..."
-
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
-          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server2 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn wildfly:start -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Djboss-as.home=target/server3 -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Testing provisioned server..."
           cd ../client
           mvn -fae verify -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           cd ../server
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
-          mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn -fae verify -Dserver.host="http://localhost:8180" -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
+          mvn -fae verify -Dserver.host="http://localhost:8280" -Pintegration-testing -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
           echo "Shutting down provisioned server..."
           cd ../client
           mvn wildfly:shutdown -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }}
diff --git a/ejb-txn-remote-call/README-source.adoc b/ejb-txn-remote-call/README-source.adoc
index 6f6e3c0caf..e0ccb0b07b 100644
--- a/ejb-txn-remote-call/README-source.adoc
+++ b/ejb-txn-remote-call/README-source.adoc
@@ -648,13 +648,13 @@ mvn verify -Pintegration-testing
 [source,subs="attributes+",options="nowrap"]
 ----
 cd ${PATH_TO_QUICKSTART_DIR}/server;
-mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180/server"
+mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180"
 ----
 +
 [source,subs="attributes+",options="nowrap"]
 ----
 cd ${PATH_TO_QUICKSTART_DIR}/server;
-mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280/server"
+mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280"
 ----
 
 . To shut down the {productName} provisioned servers using the {productName} Maven Plugin: