diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml b/ccm-bundle-devel-wildfly-swarm/pom.xml
index 466b1417b..6e4eca1e8 100644
--- a/ccm-bundle-devel-wildfly-swarm/pom.xml
+++ b/ccm-bundle-devel-wildfly-swarm/pom.xml
@@ -76,10 +76,20 @@
             <groupId>org.wildfly.swarm</groupId>
             <artifactId>datasources</artifactId>
         </dependency>
-         
+        
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
-            <artifactId>logging</artifactId>
+            <artifactId>ejb</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>hibernate-search</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>hibernate-validator</artifactId>
         </dependency>
         
         <dependency>
@@ -92,11 +102,20 @@
             <artifactId>jaxrs-cdi</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>jpa</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
             <artifactId>jsf</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>logging</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
@@ -121,7 +140,7 @@
     </dependencies>
 
     <build>
-        <finalName>ccm-bundle-devel-wildfly-swarm</finalName>
+        <finalName>ccm-bundle-devel-wildfly</finalName>
         
         <plugins>
             <plugin>
@@ -138,6 +157,37 @@
                     </execution>
                 </executions>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.libreccm</groupId>
+                            <artifactId>ccm-theme-foundry</artifactId>
+                            <type>jar</type>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.libreccm</groupId>
+                            <artifactId>ccm-core</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>assets/</include>
+                                <include>VAADIN/</include>
+                            </includes>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.librecms</groupId>
+                            <artifactId>ccm-cms</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>templates/</include>
+                            </includes>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml b/ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml
new file mode 100644
index 000000000..9a6f2d00d
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml
@@ -0,0 +1,5 @@
+swarm:
+    deployment:
+        ccm-bundle-devel-wildfly.war:
+            jaxrs:
+                application-path: /jaxrs
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
new file mode 100644
index 000000000..ebb1371dd
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    author: Jens Pelzetter
+-->
+
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence 
+                                 http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
+             version="2.1">
+
+    <persistence-unit name="LibreCCM" transaction-type="JTA">
+
+        <!-- 
+            Enforce JPA provider
+            Not really necessary here because we don't use any Hibernate 
+            specific features, but makes it easier to manage to database
+            creation scripts.
+        -->
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        
+        <jta-data-source>java:jboss/datasources/LibreCCM</jta-data-source>
+
+        <!--<jta-data-source>java:/comp/env/jdbc/libreccm/db</jta-data-source>-->
+
+        <jar-file>lib/ccm-core-7.0.0-SNAPSHOT.jar</jar-file>
+        <jar-file>lib/ccm-cms-7.0.0-SNAPSHOT.jar</jar-file>
+        <jar-file>lib/ccm-shortcuts-7.0.0-SNAPSHOT.jar</jar-file>
+
+
+        <properties>
+            <!-- Properties for Hibernate -->
+            <property name="hibernate.hbm2ddl.auto" value="validate" />
+            <property name="hibernate.connection.autocommit" value="false" />
+            <property name="hibernate.id.new_generator_mappings" value="true" />
+            <property name="wildfly.jpa.hibernate.search.module" 
+                      value="org.hibernate.search.orm:main" />
+            
+            <!--<property name="hibernate.show_sql" value="true" />
+            <property name="format_sql" value="true" />
+            <property name="use_sql_comments" value="true" />-->
+
+            <!-- 
+                Properties for Hibernate Envers 
+                We are using the ValidityAuditStrategy here because it is faster
+                when querying data than the DefaultStrategy
+            -->
+            <property name="org.hibernate.envers.audit_strategy" 
+                      value="org.hibernate.envers.strategy.ValidityAuditStrategy"/>
+        </properties>
+
+    </persistence-unit>
+
+</persistence>