diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml
index 67fc96d5369..c31d95c1443 100644
--- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml
index 89a021d0857..5bdedfd117e 100644
--- a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
                             <app>target/dirListing.war</app>
                             <port>8080</port>
diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml
index aa07d0b5526..f2e977179a0 100644
--- a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml
index 30c104a4a2c..d49a3e60171 100644
--- a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/index/pom.xml b/appserver/tests/embedded/maven-plugin/index/pom.xml
index dfdfd43d0c4..840f2ec7805 100644
--- a/appserver/tests/embedded/maven-plugin/index/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/index/pom.xml
@@ -42,7 +42,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml
index 4cce74157ea..a726155e69a 100644
--- a/appserver/tests/embedded/maven-plugin/init/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/init/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <goals>
diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml
index 8c6c259e7c7..7f3c4429bf6 100644
--- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
index 4813572b75d..f118cef0da6 100644
--- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
@@ -44,7 +44,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
                             <ports>
                                 <https-listener>8181</https-listener>
diff --git a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml
index 49b5220d0da..5784243e4a7 100644
--- a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml
@@ -53,7 +53,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
                             <systemPropertiesFile>${project.build.testOutputDirectory}/system.properties</systemPropertiesFile>
                         </configuration>
diff --git a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml
index f7edde05c11..d365f211991 100644
--- a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/mdb/pom.xml b/appserver/tests/embedded/maven-plugin/mdb/pom.xml
index fb4af5fcd3c..ce4189c5e05 100644
--- a/appserver/tests/embedded/maven-plugin/mdb/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/mdb/pom.xml
@@ -42,7 +42,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml
index d6dda701ac0..db1f99ec1bc 100644
--- a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml
@@ -53,7 +53,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
                             <systemPropertiesFile>${project.build.testOutputDirectory}/system.properties</systemPropertiesFile>
                         </configuration>
diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml
index d647eb179a0..fdb3f09e1e2 100644
--- a/appserver/tests/embedded/maven-plugin/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/pom.xml
@@ -153,9 +153,10 @@
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.embedded</groupId>
-                    <artifactId>maven-embedded-glassfish-plugin</artifactId>
-                    <version>5.1</version>
+                    <artifactId>embedded-glassfish-maven-plugin</artifactId>
+                    <version>8.0</version>
                     <configuration>
+                        <glassfish.version>${project.version}</glassfish.version>
                         <app>target/${project.artifactId}.war</app>
                         <port>8080</port>
                         <name>${project.artifactId}</name>
@@ -169,11 +170,6 @@
                         </systemProperties>
                     </configuration>
                     <dependencies>
-                        <dependency>
-                            <groupId>org.glassfish.main.common</groupId>
-                            <artifactId>simple-glassfish-api</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
                         <dependency>
                             <groupId>org.glassfish.main.extras</groupId>
                             <artifactId>glassfish-embedded-all</artifactId>
diff --git a/appserver/tests/embedded/maven-plugin/queryString/pom.xml b/appserver/tests/embedded/maven-plugin/queryString/pom.xml
index 2546f20c7d6..31f158d0f98 100644
--- a/appserver/tests/embedded/maven-plugin/queryString/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/queryString/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml
index b871daee256..170023370db 100644
--- a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml
@@ -42,7 +42,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
index 8c9aded6707..f7ee9377441 100644
--- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml
@@ -53,7 +53,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
                             <bootstrapProperties>
                                 <property>test_key=test_value</property>
diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml
index f163c83d903..ddda24b6bf5 100644
--- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml
index 3f01e8324d1..658e8dab9eb 100644
--- a/appserver/tests/embedded/maven-plugin/simple/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml
@@ -42,8 +42,9 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <configuration>
+                            <fork>false</fork>
                             <app>hello.war</app>
                             <port>8080</port>
                         </configuration>
diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml
index 2deabfa2d66..e3490e85800 100644
--- a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml
@@ -43,7 +43,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
index 20f6b5dbd57..12ae10b6268 100644
--- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml
@@ -45,7 +45,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <dependencies>
                             <dependency>
                                 <groupId>org.glassfish.main.extras</groupId>
diff --git a/appserver/tests/embedded/maven-plugin/webservice/pom.xml b/appserver/tests/embedded/maven-plugin/webservice/pom.xml
index 063c2ba952f..1b0807ea32b 100644
--- a/appserver/tests/embedded/maven-plugin/webservice/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/webservice/pom.xml
@@ -44,7 +44,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>
diff --git a/appserver/tests/embedded/maven-plugin/websockets/pom.xml b/appserver/tests/embedded/maven-plugin/websockets/pom.xml
index 2ad206d136e..22956d61ed2 100644
--- a/appserver/tests/embedded/maven-plugin/websockets/pom.xml
+++ b/appserver/tests/embedded/maven-plugin/websockets/pom.xml
@@ -48,7 +48,7 @@
                 <plugins>
                     <plugin>
                         <groupId>org.glassfish.embedded</groupId>
-                        <artifactId>maven-embedded-glassfish-plugin</artifactId>
+                        <artifactId>embedded-glassfish-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>start</id>