diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index 791ecb6d2f..fd36050d6f 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -220,9 +220,15 @@
                                 <layer>jaxrs-server</layer>
                                 <layer>jsf</layer>
                             </layers>
-                            <scripts>
-                                <script>${configure.ds.script}</script>
-                            </scripts>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${configure.ds.script}</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                             <!--
                                 Rename the output war to ROOT.war before adding it to the server, so that the
                                 application is deployed in the root web context.
@@ -231,26 +237,8 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>server-provisioning</id>
-                                <phase>generate-test-resources</phase>
                                 <goals>
-                                    <goal>provision</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>wildfly-start</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                    <goal>execute-commands</goal>
-                                    <goal>deploy</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <phase>post-integration-test</phase>
-                                <id>wildfly-stop</id>
-                                <goals>
-                                    <goal>shutdown</goal>
+                                    <goal>package</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -266,18 +254,37 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <context>cloud</context>
-                                <addOns>
-                                    <addOn>h2-database:default</addOn>
-                                </addOns>
-                            </discover-provisioning-info>
+                            <feature-packs>
+                                <feature-pack>
+                                    <groupId>${server.test.feature.pack.groupId}</groupId>
+                                    <artifactId>${server.test.feature.pack.artifactId}</artifactId>
+                                    <version>${version.server}</version>
+                                </feature-pack>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-datasources-galleon-pack:8.0.1.Final</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <layer>core-tools</layer>
+                                <layer>batch-jberet</layer>
+                                <layer>h2-driver</layer>
+                                <layer>jaxrs-server</layer>
+                                <layer>jsf</layer>
+                            </layers>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${configure.ds.script}</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                             <!--
                                 The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
                                 application is deployed in the root web context. Add ROOT.war to the server.
                             -->
-                            <filename>ROOT.war</filename>
+                            <name>ROOT.war</name>
                         </configuration>
                         <executions>
                             <execution>