diff --git a/ccm-bundle-devel-wildfly-web/README.md b/ccm-bundle-devel-wildfly-web/README.md
new file mode 100644
index 000000000..9efaa9761
--- /dev/null
+++ b/ccm-bundle-devel-wildfly-web/README.md
@@ -0,0 +1,7 @@
+## Prepare Wildfly:
+
+mvn -pl ccm-bundle-devel-wildfly-web wildfly:start wildfly:deploy-artifact@deploy-jdbc-driver wildfly:add-resource@add-datasource wildfly:shutdown
+
+## Running
+
+mvn -pl ccm-bundle-devel-wildfly-web -am wildfly:run
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index db6b2455a..7ab045e69 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -61,6 +61,12 @@
             <artifactId>ccm-cms-tinymce</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -217,7 +223,31 @@
                     </overlays>
                 </configuration>
             </plugin>
-
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <excludeDefaultDirectories>true</excludeDefaultDirectories>
+                    <filesets>
+                        <fileset>
+                            <directory>${project.build.directory}</directory>
+                            <includes>
+                                <include>classes/</include>
+                                <include>generated-resources/</include>
+                                <include>libreccm-web-wildfly/</include>
+                                <include>libreccm-web-wildfly.war</include>
+                                <include>maven-archiver/</include>
+                                <include>test-classes/</include>
+                                <include>war/</include>
+                            </includes>
+                            <excludes>
+                                <execlude>wildfly*</execlude>
+                            </excludes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
             <!--            <plugin>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
@@ -227,12 +257,72 @@
                     </commands>
                 </configuration>
             </plugin>-->
+            
+            <plugin>
+                <groupId>org.wildfly.plugins</groupId>
+                <artifactId>wildfly-maven-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start</id>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                        <configuration>
+                            <stdout>System.out</stdout>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>deploy-jdbc-driver</id>
+                        <configuration>
+                            <groupId>org.postgresql</groupId>
+                            <artifactId>postgresql</artifactId>
+                            <name>postgresql.jar</name>
+                        </configuration>
+                        <goals>
+                            <goal>deploy-artifact</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>add-datasource</id>
+                        <configuration>
+                            <address>subsystem=datasources,data-source=ccm-devel</address>
+                            <resources>
+                                <resource>
+                                    <!--<enableResource>true</enableResource>-->
+                                    <properties>
+                                        <connection-url>${wildfly.datasource.connectionUrl}</connection-url>
+                                        <jndi-name>java:/comp/env/jdbc/libreccm/db</jndi-name>
+                                        <enabled>true</enabled>
+                                        <user-name>${wildfly.datasource.username}</user-name>
+                                        <password>${wildfly.datasource.password}</password>
+                                        <use-ccm>false</use-ccm>
+                                        <driver-name>postgresql.jar</driver-name>
+                                    </properties>
+                                </resource>
+                            </resources>
+                                   
+                        </configuration>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>shutdown</id>
+                        <goals>
+                            <goal>shutdown</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     
     <profiles>
         <profile>
-            <id>run-with-wildfly</id>
+            <id>prepare-wildfly</id>
             <dependencies>
                 <dependency>
                     <groupId>org.postgresql</groupId>
@@ -244,6 +334,9 @@
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
                         <executions>
                             <!--                            <execution>
                                 <id>undeploy</id>
@@ -321,20 +414,20 @@
                                     <goal>run</goal>
                                 </goals>
                             </execution>-->
-                            <execution>
+                            <!--                            <execution>
                                 <id>deploy</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>deploy-only</goal>
                                 </goals>
-                            </execution>
-                            <!--<execution>
-                                <id>start</id>
+                            </execution>-->
+                            <execution>
+                                <id>shutdown</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>start</goal>
+                                    <goal>shutdown</goal>
                                 </goals>
-                            </execution>-->
+                            </execution>
                         </executions>
                     </plugin>
                 </plugins>
diff --git a/pom.xml b/pom.xml
index 2430a0755..7ed296253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,11 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>3.1.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -330,6 +335,9 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>2.1.0.Beta1</version>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>