diff --git a/batch-processing/configure-server.cli b/batch-processing/configure-server.cli
new file mode 100644
index 0000000000..fda2656dde
--- /dev/null
+++ b/batch-processing/configure-server.cli
@@ -0,0 +1,15 @@
+# Batch script to configure the datasource
+batch
+
+# Start by creating the JDBC datasource
+/subsystem=datasources/data-source=batch-processingDS:add(connection-url="jdbc:h2:mem:batch-processingDS;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1", jndi-name="java:jboss/datasources/batch-processingDS", driver-name=h2, user-name="sa", password="sa", enabled="true", use-java-context=true)
+/subsystem=batch-jberet/jdbc-job-repository=jdbc:add(data-source=batch-processingDS)
+/subsystem=batch-jberet:write-attribute(name=default-job-repository,value=jdbc)
+
+# Run the batch commands
+run-batch
+
+# Reload the server configuration
+#reload
+
+
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index e5c11c62d7..1608cf113b 100644
--- a/batch-processing/pom.xml
+++ b/batch-processing/pom.xml
@@ -209,6 +209,15 @@
                                 application is deployed in the root web context.
                             -->
                             <name>ROOT.war</name>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${basedir}/configure-server.cli</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                         </configuration>
                         <executions>
                             <execution>
@@ -241,6 +250,15 @@
                                 application is deployed in the root web context. Add ROOT.war to the server.
                             -->
                             <filename>ROOT.war</filename>
+                            <packaging-scripts>
+                                <packaging-script>
+                                    <scripts>
+                                        <script>${basedir}/configure-server.cli</script>
+                                    </scripts>
+                                    <!-- Expressions resolved during server execution -->
+                                    <resolve-expressions>false</resolve-expressions>
+                                </packaging-script>
+                            </packaging-scripts>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/batch-processing/src/main/resources/META-INF/persistence.xml b/batch-processing/src/main/resources/META-INF/persistence.xml
index a9c09a5e52..a422aae63e 100644
--- a/batch-processing/src/main/resources/META-INF/persistence.xml
+++ b/batch-processing/src/main/resources/META-INF/persistence.xml
@@ -25,8 +25,6 @@
    <persistence-unit name="primary" transaction-type="JTA">
       <!-- If you are running in a production environment, add a managed
          data source, this example data source is just for development and testing! -->
-      <!-- The datasource is deployed as WEB-INF/jboss-batch-processing-ds.xml, you
-         can find it in the source at src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml -->
       <jta-data-source>java:jboss/datasources/batch-processingDS</jta-data-source>
       <properties>
          <!-- Properties for Hibernate -->
diff --git a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
deleted file mode 100644
index fb23f37023..0000000000
--- a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    JBoss, Home of Professional Open Source
-    Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
-    contributors by the @authors tag. See the copyright.txt in the
-    distribution for a full listing of individual contributors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- This is an unmanaged datasource. It should be used for proofs of concept
-    or testing only. It uses H2, an in memory database that ships with JBoss
-    AS. -->
-<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
-    <!-- The datasource is bound into JNDI at this location. We reference
-        this in META-INF/persistence.xml -->
-    <datasource jndi-name="java:jboss/datasources/batch-processingDS"
-        pool-name="jboss-batch-processing" enabled="true"
-        use-java-context="true">
-        <connection-url>jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
-        <driver>h2</driver>
-        <security>
-            <user-name>sa</user-name>
-            <password>sa</password>
-        </security>
-    </datasource>
-</datasources>
-