diff --git a/build-config/pom.xml b/build-config/pom.xml
index eb584ced..830ca6f1 100644
--- a/build-config/pom.xml
+++ b/build-config/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-drone-build-config</artifactId>
     <name>Arquillian Drone Extension Build Configuration</name>
 
diff --git a/drone-bom/pom.xml b/drone-bom/pom.xml
index 2cc18658..7cd361b1 100644
--- a/drone-bom/pom.xml
+++ b/drone-bom/pom.xml
@@ -13,7 +13,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Artifact Configuration -->
-    <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-drone-bom</artifactId>
 
     <packaging>pom</packaging>
diff --git a/drone-build/pom.xml b/drone-build/pom.xml
index affc33ca..5453093a 100644
--- a/drone-build/pom.xml
+++ b/drone-build/pom.xml
@@ -14,7 +14,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Artifact Configuration -->
-    <groupId>org.jboss.arquillian.extension</groupId>
     <artifactId>arquillian-drone-build</artifactId>
 
     <packaging>pom</packaging>
@@ -30,10 +29,7 @@
 
     <properties>
         <!-- Versioning -->
-        <version.jpa>1.0</version.jpa>
-        <version.cdi>1.0-SP1</version.cdi>
-        <version.jsf>2.0.2-FCS</version.jsf>
-        <version.el>2.2</version.el>
+        <version.javaee6-web.spec>3.0.0.Beta1</version.javaee6-web.spec>
     </properties>
 
     <!-- Plugin Configuration -->
@@ -43,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.9</version>
+                <version>2.10</version>
             </plugin>
             <!-- Checkstyle -->
             <plugin>
@@ -72,6 +68,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Compiler -->
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerVersion>1.6</compilerVersion>
+                    <showDeprecation>false</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                    <optimize>true</optimize>
+                    <fork>true</fork>
+                    <compilerArguments>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </compilerArguments>
+                    <argLine>-Xmx512M</argLine>
+                    <executable>${JAVA_HOME}/bin/javac</executable>
+                </configuration>
+            </plugin>
         </plugins>
 
         <pluginManagement>
@@ -211,23 +227,13 @@
                 <version>${version.slf4j}</version>
             </dependency>
 
-            <!-- we are using a Weld based example for testing -->
-            <dependency>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
-                <version>${version.cdi}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.faces</groupId>
-                <artifactId>jsf-api</artifactId>
-                <version>${version.jsf}</version>
-            </dependency>
-
+            <!-- we are using a Java EE 6 based example for testing -->
             <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>persistence-api</artifactId>
-                <version>${version.jpa}</version>
+                <groupId>org.jboss.spec</groupId>
+                <artifactId>jboss-javaee-web-6.0</artifactId>
+                <version>${version.javaee6-web.spec}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
 
         </dependencies>
diff --git a/drone-selenium/pom.xml b/drone-selenium/pom.xml
index d156748d..98936668 100644
--- a/drone-selenium/pom.xml
+++ b/drone-selenium/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!-- Parent -->
     <parent>
@@ -43,7 +44,7 @@
             <artifactId>arquillian-drone-configuration</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
         <!-- Arquillian dependencies -->
         <dependency>
             <groupId>org.jboss.arquillian.core</groupId>
@@ -64,7 +65,7 @@
             <artifactId>selenium-java</artifactId>
             <scope>provided</scope>
         </dependency>
-      
+
         <!-- required to run Selenium DefaultSelenium -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -91,7 +92,7 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- we are using a Weld based example for testing -->
+        <!-- we are using a Jave EE 6 based example for testing -->
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
@@ -99,14 +100,14 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>org.jboss.spec.javax.faces</groupId>
+            <artifactId>jboss-jsf-api_2.0_spec</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -181,7 +182,7 @@
 
         <!-- CONTAINER PROFILES -->
 
-        <!--  Deploys example to managed JBoss AS 6 instance -->
+        <!-- Deploys example to managed JBoss AS 6 instance -->
         <profile>
             <id>jbossas-managed-6</id>
 
diff --git a/drone-webdriver/pom.xml b/drone-webdriver/pom.xml
index d65965ec..1b974e1c 100644
--- a/drone-webdriver/pom.xml
+++ b/drone-webdriver/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!-- Parent -->
     <parent>
@@ -27,7 +28,7 @@
     <properties>
     </properties>
 
-   <!-- Dependencies -->
+    <!-- Dependencies -->
     <dependencies>
         <dependency>
             <groupId>org.jboss.arquillian.extension</groupId>
@@ -44,8 +45,8 @@
             <artifactId>arquillian-drone-configuration</artifactId>
             <version>${project.version}</version>
         </dependency>
-       
-        
+
+
         <!-- Arquillian dependencies -->
         <dependency>
             <groupId>org.jboss.arquillian.core</groupId>
@@ -73,7 +74,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -94,7 +95,7 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- we are using a Weld based example for testing -->
+        <!-- we are using a Jave EE 6 based example for testing -->
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
@@ -102,14 +103,14 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>org.jboss.spec.javax.faces</groupId>
+            <artifactId>jboss-jsf-api_2.0_spec</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -137,7 +138,7 @@
 
     <profiles>
 
-        <!--  Uses Selenium 2.0 default, that is WebDriver HtmlUnit driver -->
+        <!-- Uses Selenium 2.0 default, that is WebDriver HtmlUnit driver -->
         <profile>
             <id>ftest</id>
 
@@ -174,7 +175,7 @@
 
         <!-- CONTAINER PROFILES -->
 
-        <!--  Deploys example to managed JBoss AS 6 instance -->
+        <!-- Deploys example to managed JBoss AS 6 instance -->
         <profile>
 
             <id>jbossas-managed-6</id>
diff --git a/pom.xml b/pom.xml
index 10f03737..db277253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!-- Parent -->
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>6</version>
+        <version>7</version>
         <relativePath />
     </parent>
 
@@ -35,15 +36,13 @@
 
     <properties>
         <!-- Versioning -->
-        <version.arquillian.core>1.0.0.CR4</version.arquillian.core>
+        <version.arquillian.core>1.0.0.CR6</version.arquillian.core>
         <version.selenium.server>2.13.0</version.selenium.server>
         <version.selenium>2.13.0</version.selenium>
         <version.slf4j>1.5.10</version.slf4j>
 
         <!-- override from parent -->
         <version.release.plugin>2.1</version.release.plugin>
-        <maven.compiler.target>1.5</maven.compiler.target>
-        <maven.compiler.source>1.5</maven.compiler.source>
     </properties>
 
     <build>
@@ -62,10 +61,10 @@
     <!-- Modules -->
     <modules>
 
-        <!-- Drone build chain-->
+        <!-- Drone build chain -->
         <module>build-config</module>
         <module>drone-bom</module>
-        <module>drone-build</module>        
+        <module>drone-build</module>
 
         <!-- Drone modules -->
         <module>drone-api</module>
@@ -74,7 +73,7 @@
         <module>drone-impl</module>
         <module>drone-selenium-server</module>
         <module>drone-selenium</module>
-        <module>drone-webdriver</module>        
+        <module>drone-webdriver</module>
     </modules>
 
 </project>