diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 749675b..0158c60 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -21,7 +21,7 @@
   xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-  name="turbine-5.0-webapp">
+  name="turbine-5.1-webapp">
 
   <requiredProperties>
     <requiredProperty key="turbine_app_name">
@@ -54,12 +54,12 @@
     <requiredProperty key="turbine_database_password">
       <defaultValue>db_password</defaultValue>
     </requiredProperty>
-     <requiredProperty key="app_volume_local_repo">
+    <requiredProperty key="app_volume_local_repo">
         <defaultValue>${settings.localRepository}</defaultValue>
-     </requiredProperty>
-     <requiredProperty key="docker">
+    </requiredProperty>
+    <requiredProperty key="docker">
         <defaultValue>${docker}</defaultValue>
-     </requiredProperty>
+    </requiredProperty>
   </requiredProperties>
   <fileSets>
     <fileSet filtered="true" packaged="true">
diff --git a/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml b/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
index 868ad52..f438d83 100644
--- a/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
+++ b/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
@@ -9,10 +9,10 @@
         dockerfile: ./docker-resources/app/Dockerfile
     # uncomment, if no remote debugging app is required
     environment:
-        - MAVEN_OPTS=-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9000
+        - MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=9000,server=y,suspend=y
     
     # this runs the app server in the container, be sure not to filter resources once again!
-    command: mvn -Pjetty,docker
+    command: mvn -Pjetty
     ports:
       - "8081:8081"
       # remote debugging port, uncomment if not needed
@@ -26,9 +26,9 @@
     #  - "3000"
 
     volumes:
-      # project root wtih pom.xml and src folder
+      # project root with pom.xml and src folder
       - ../../:/myapp
-      # or use local sapp/ettings.xml
+      # or use local app/settings.xml
       - '#var("app_volume_local_repo"):/m2repo'
 
   db:
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
index 06d1032..31bbc44 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
@@ -129,10 +129,10 @@
      - requires attribute peerClass in fulcrum-turbine-schema.xml table elements set to org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer 
      -->
      
-     <userManager>
+   <userManager>
         <className>${package}.om.TurbineUser</className>
         <peerClassName>${package}.om.TurbineUserPeerImpl</peerClassName>
-        <userGroupRoleManager><!-- using custom peers requires now since fulcrum security 1.1.2 this element -->
+        <userGroupRoleManager><!-- using custom peers requires now this element -->
 	        <!-- className>org.apache.fulcrum.security.torque.om.TurbineUserGroupRole</className-->
 	        <peerClassName>${package}.om.TurbineUserGroupRolePeerImpl</peerClassName>
 	    </userGroupRoleManager>