diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a318fb..8146f92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,15 @@ jobs:
       - restore_cache:
           key: circleci-arquillian-container-glassfish-6-{{ checksum "pom.xml" }}
       - run: ./mvnw verify -q -U -DskipTests # pre-fetch dependencies (dependency:resolve fails)
-      - run: ./mvnw verify
+      - run: ./mvnw -X verify
+      - run:
+          name: Target glassfish-managed-6/target
+          command: tar -czvf glassfish-managed-6.tar.gz glassfish-managed/target
+          when: always
+      - store_artifacts:
+          path: glassfish-managed-6.tar.gz
+      - store_artifacts:
+          path: glassfish-managed/target/glassfish6/glassfish/domains/domain1/logs/server.log
       - store_test_results:
           path: target/surefire-reports
       - save_cache:
@@ -27,4 +35,4 @@ workflows:
       - build:
           matrix:
             parameters:
-              jdk-version: ["8", "9"]
+              jdk-version: ["8"]
diff --git a/glassfish-common/pom.xml b/glassfish-common/pom.xml
index 14584e7..215841a 100644
--- a/glassfish-common/pom.xml
+++ b/glassfish-common/pom.xml
@@ -1,12 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
+    <artifactId>arquillian-parent-glassfish-jakarta</artifactId>
     <groupId>org.jboss.arquillian.container</groupId>
-    <version>1.0.0.Final-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <version>6.0.0.Final-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>arquillian-glassfish6-common</artifactId>
+  <artifactId>arquillian-glassfish-common-jakarta</artifactId>
   <name>Arquillian Container GlassFish 6+ Common Services</name>
 
   <dependencies>
diff --git a/glassfish-managed-6/pom.xml b/glassfish-managed/pom.xml
similarity index 95%
rename from glassfish-managed-6/pom.xml
rename to glassfish-managed/pom.xml
index 6660fab..123c114 100644
--- a/glassfish-managed-6/pom.xml
+++ b/glassfish-managed/pom.xml
@@ -4,12 +4,12 @@
 
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
-    <version>1.0.0.Final-SNAPSHOT</version>
+    <artifactId>arquillian-parent-glassfish-jakarta</artifactId>
+    <version>6.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>arquillian-glassfish-managed-6</artifactId>
+  <artifactId>arquillian-glassfish-manged-jakarta</artifactId>
   <name>Arquillian Container GlassFish Managed 6</name>
   <description>GlassFish 6 Managed Container integration for the Arquillian Project</description>
 
@@ -26,7 +26,7 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java
similarity index 100%
rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java
rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerConfiguration.java
diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java
similarity index 100%
rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java
rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedContainerExtension.java
diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java
similarity index 100%
rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java
rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployableContainer.java
diff --git a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java
similarity index 98%
rename from glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java
rename to glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java
index 250323f..84ce17b 100644
--- a/glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java
+++ b/glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java
@@ -173,6 +173,9 @@ private void executeAdminCommand(String description, String command, List<String
         if (result != 0) {
             throw new LifecycleException("Unable to execute " + cmd.toString());
         }
+        if (config.isOutputToConsole()) {
+            System.out.println(description + " process started");
+        }
     }
 
     private List<String> buildCommand(String command, List<String> args) {
diff --git a/glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-managed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-managed/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/CDIJarTestCase.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishDeployWithoutAppXmlTest.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployEarTest.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java
similarity index 94%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java
index 783792f..25fecf1 100644
--- a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java
+++ b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java
@@ -36,7 +36,8 @@ public class GlassFishManagedDeployWarTest extends GlassFishManagedDeploymentTes
     @Deployment(testable = false)
     public static WebArchive getTestArchive() {
         return ShrinkWrap.create(WebArchive.class, "test.war")
-            .addClasses(GreeterServlet.class, Greeter.class)
+            .addClass(greeterImplementationBasedOnDerbyEnabled())
+            .addClass(Greeter.class)
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }
 }
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeploymentTestTemplate.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/Greeter.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServlet.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GreeterServletWithDerby.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/SimpleBean.java
diff --git a/glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java b/glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java
similarity index 100%
rename from glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java
rename to glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/StartGFTest.java
diff --git a/glassfish-managed-6/src/test/resources/application.xml b/glassfish-managed/src/test/resources/application.xml
similarity index 100%
rename from glassfish-managed-6/src/test/resources/application.xml
rename to glassfish-managed/src/test/resources/application.xml
diff --git a/glassfish-managed-6/src/test/resources/arquillian.xml b/glassfish-managed/src/test/resources/arquillian.xml
similarity index 96%
rename from glassfish-managed-6/src/test/resources/arquillian.xml
rename to glassfish-managed/src/test/resources/arquillian.xml
index d3f3e18..96486a1 100644
--- a/glassfish-managed-6/src/test/resources/arquillian.xml
+++ b/glassfish-managed/src/test/resources/arquillian.xml
@@ -18,7 +18,7 @@
       <property name="allowConnectingToRunningServer">false</property>
       <property name="outputToConsole">true</property>
       <!-- true enables verbose logging of the jaxrs requests -->
-      <property name="debugRequests">true</property>
+      <property name="debugRequests">false</property>
     </configuration>
   </container>
 
diff --git a/glassfish-remote-6/README.txt b/glassfish-remote/README.adoc
similarity index 78%
rename from glassfish-remote-6/README.txt
rename to glassfish-remote/README.adoc
index 75e8d8c..04f355d 100644
--- a/glassfish-remote-6/README.txt
+++ b/glassfish-remote/README.adoc
@@ -1,6 +1,6 @@
 
 
-How to use this container integration?
+= How to use this container integration?
 
 This implementation provides the Arquillian integration with your remote GlassFish 3.1 
 container. You can use your normal GlassFish 3.1 deployment to perform your test. The 
@@ -11,42 +11,42 @@ or virtual nodes, or on the same one.
 
 The properties you can use:
 
-adminHttps: You can use it to specify whether the http or https protocol shall be used 
+* adminHttps: You can use it to specify whether the http or https protocol shall be used
 to access the DAS. The property value can be true or false. If omitted the default value 
 is false, meaning the http protocol shall be used.
 
-adminHost: Glassfish Admin Server (DAS) host address. If  omitted the default value is 
+* adminHost: Glassfish Admin Server (DAS) host address. If  omitted the default value is
 localhost.
 
-adminPort: The port to be used to access Glassfish Admin API. If  omitted the default 
+* adminPort: The port to be used to access Glassfish Admin API. If  omitted the default
 value is 4848.
 
-adminUser: The name of the admin user of your DAS. If omitted, no authentication will 
+* adminUser: The name of the admin user of your DAS. If omitted, no authentication will
 be used to access the DAS. This case you must have empty password for your admin user of 
 your domain. 
 
-adminPassword: The password of the admin user of your DAS. Canot be omitted if you 
+* adminPassword: The password of the admin user of your DAS. Canot be omitted if you
 declare the admin user. If no authentication will be used to access the DAS you must 
 have empty password for your admin user of your domain. 
 
-serverHttps: You can use it to specify whether the http or https protocol shall be used 
+* serverHttps: You can use it to specify whether the http or https protocol shall be used
 to access the target server for deployment, on which your test runs. The property value 
 can be true or false. If omitted the default value is false, meaning the http protocol 
 shall be used.
 
-target: GlassFish has a notion of target, which specifies the target to which you are 
+* target: GlassFish has a notion of target, which specifies the target to which you are
 deploying. We use the ?target? as property key with the same semantics as the standard 
 GlassFish utilities do.
 
 Valid values of the target are:
  
- -  server:  Deploys the component to the default Admin Server instance (on your DAS 
+*  server:  Deploys the component to the default Admin Server instance (on your DAS
  server). This is the default value if the property is omitted.
 
- -  instance_name: Deploys the component to the specified stand-alone sever instance, 
+*  instance_name: Deploys the component to the specified stand-alone sever instance,
  which may be on the same hosts or can be on a different one as the DAS server.
 
- -  cluster_name: Deploys the component to every server instance in the cluster. They 
+*  cluster_name: Deploys the component to every server instance in the cluster. They
  can be on the same or on several other hosts as the DAS server. Note: Arquillion use 
  only one instance to run the test case.
  
diff --git a/glassfish-remote-6/pom.xml b/glassfish-remote/pom.xml
similarity index 92%
rename from glassfish-remote-6/pom.xml
rename to glassfish-remote/pom.xml
index f383439..0d39083 100644
--- a/glassfish-remote-6/pom.xml
+++ b/glassfish-remote/pom.xml
@@ -3,14 +3,14 @@
 
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
-    <version>1.0.0.Final-SNAPSHOT</version>
+    <artifactId>arquillian-parent-glassfish-jakarta</artifactId>
+    <version>6.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>arquillian-glassfish-remote-6</artifactId>
+  <artifactId>arquillian-glassfish-remote-jakarta</artifactId>
   <name>Arquillian Container GlassFish Remote 6.x</name>
   <description>GlassFish 6.x Remote Container integration for the Arquillian Project</description>
 
@@ -26,7 +26,7 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java
similarity index 100%
rename from glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java
rename to glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishExtension.java
diff --git a/glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java b/glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java
similarity index 100%
rename from glassfish-remote-6/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java
rename to glassfish-remote/src/main/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployableContainer.java
diff --git a/glassfish-remote-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/glassfish-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from glassfish-remote-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to glassfish-remote/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/CDIJarTestCase.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishDeployWithoutAppXmlTest.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployEarTest.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GlassFishRestDeployWarTest.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/Greeter.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/GreeterServlet.java
diff --git a/glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java b/glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java
similarity index 100%
rename from glassfish-remote-6/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java
rename to glassfish-remote/src/test/java/org/jboss/arquillian/container/glassfish/remote_6/SimpleBean.java
diff --git a/glassfish-remote-6/src/test/resources/application.xml b/glassfish-remote/src/test/resources/application.xml
similarity index 100%
rename from glassfish-remote-6/src/test/resources/application.xml
rename to glassfish-remote/src/test/resources/application.xml
diff --git a/glassfish-remote-6/src/test/resources/arquillian.xml b/glassfish-remote/src/test/resources/arquillian.xml
similarity index 100%
rename from glassfish-remote-6/src/test/resources/arquillian.xml
rename to glassfish-remote/src/test/resources/arquillian.xml
diff --git a/pom.xml b/pom.xml
index 81d3cac..c242591 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
 
   <!-- Artifact Configuration -->
   <groupId>org.jboss.arquillian.container</groupId>
-  <artifactId>arquillian-parent-glassfish6</artifactId>
-  <version>1.0.0.Final-SNAPSHOT</version>
+  <artifactId>arquillian-parent-glassfish-jakarta</artifactId>
+  <version>6.0.0.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Arquillian Container Parent GlassFish 6+</name>
   <description>GlassFish 6.x and Later Container integrations for the Arquillian Project</description>
@@ -29,17 +29,18 @@
 
   <!-- Properties -->
   <properties>
-    <version.arquillian_core>1.7.0.Alpha2</version.arquillian_core>
-    <version.glassfish6>6.0.0-M1</version.glassfish6>
+    <version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
+    <version.glassfish6>6.0.0</version.glassfish6>
     <!-- The Jakarta EE 9 based release version -->
-    <version.jersey>3.0.0-M4</version.jersey>
-    <jakarta.cdi.version>3.0.0-M3</jakarta.cdi.version>
-    <jakarta.el.version>4.0.0.M1</jakarta.el.version>
-    <jakarta.interceptor.version>2.0.0-RC2</jakarta.interceptor.version>
-    <jakarta.ejb.version>4.0.0-RC1</jakarta.ejb.version>
-    <jakarta.annotation.version>2.0.0-RC1</jakarta.annotation.version>
-    <jakarta.servlet.version>5.0.0-M1</jakarta.servlet.version>
-    <jakarta.jaxb.version>3.0.0-RC3</jakarta.jaxb.version>
+    <version.jersey>3.0.1</version.jersey>
+    <jakarta.cdi.version>3.0.0</jakarta.cdi.version>
+    <jakarta.el.version>4.0.0</jakarta.el.version>
+    <jakarta.interceptor.version>2.0.0</jakarta.interceptor.version>
+    <jakarta.ejb.version>4.0.0</jakarta.ejb.version>
+    <jakarta.annotation.version>2.0.0</jakarta.annotation.version>
+    <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
+    <jakarta.jaxb.version>3.0.0</jakarta.jaxb.version>
+    <jakarta.inject.version>2.0.0</jakarta.inject.version>
   </properties>
 
   <dependencyManagement>
@@ -48,12 +49,12 @@
       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>
-        <version>2.0.0-RC1</version>
+        <version>${jakarta.annotation.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.inject</groupId>
         <artifactId>jakarta.inject-api</artifactId>
-        <version>2.0.0-RC4</version>
+        <version>${jakarta.inject.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.enterprise</groupId>
@@ -129,8 +130,8 @@
 
   <modules>
     <module>glassfish-common</module>
-    <module>glassfish-managed-6</module>
-    <module>glassfish-remote-6</module>
+    <module>glassfish-managed</module>
+    <module>glassfish-remote</module>
     <!--
     TODO:
     <module>glassfish-embedded-6</module>