diff --git a/docs/src/main/asciidoc/Getting_Started_Guide.adoc b/docs/src/main/asciidoc/Getting_Started_Guide.adoc
index 8a663082cf90..23f962c17685 100644
--- a/docs/src/main/asciidoc/Getting_Started_Guide.adoc
+++ b/docs/src/main/asciidoc/Getting_Started_Guide.adoc
@@ -430,7 +430,7 @@ to what's shown below.
  
   JAVA: java
  
-  JAVA_OPTS:  -server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=com.yourkit,org.jboss.byteman -Djava.awt.headless=true
+  JAVA_OPTS:  -server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=com.yourkit,org.jboss.byteman -Djava.awt.headless=true
  
 =========================================================================
  
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf
index c0bd779a0deb..efacd9091e18 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf
+++ b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf
@@ -42,7 +42,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-   JAVA_OPTS="-Xms64m -Xmx512m -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true"
+   JAVA_OPTS="-Xms64m -Xmx512m -Djava.net.preferIPv4Stack=true"
    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
 fi
 
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.bat b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.bat
index 3b5c7b9b28e9..7a7b411ed5ad 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.bat
+++ b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.bat
@@ -40,7 +40,7 @@ rem # options that are always passed by run.bat.
 rem #
 
 rem # JVM memory allocation pool parameters - modify as appropriate.
-set "JAVA_OPTS=-Xms64M -Xmx512M -XX:MaxMetaspaceSize=256m"
+set "JAVA_OPTS=-Xms64M -Xmx512M"
 
 rem # Prefer IPv4
 set "JAVA_OPTS=%JAVA_OPTS%  -Djava.net.preferIPv4Stack=true "
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.ps1 b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.ps1
index 87b8ddf7ee90..708b56517b99 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.ps1
+++ b/ee-feature-pack/galleon-shared/src/main/resources/content/bin/appclient.conf.ps1
@@ -41,7 +41,6 @@ $JAVA_OPTS = @()
 # JVM memory allocation pool parameters - modify as appropriate.
 $JAVA_OPTS += '-Xms64M'
 $JAVA_OPTS += '-Xmx512M'
-$JAVA_OPTS += '-XX:MaxMetaspaceSize=256m'
 
 # Reduce the RMI GCs to once per hour for Sun JVMs.
 $JAVA_OPTS += '-Dsun.rmi.dgc.client.gcInterval=3600000'
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-primary.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-primary.xml
index af3e14abdeb2..d13b05a27391 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-primary.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-primary.xml
@@ -10,7 +10,7 @@
         <param name="host" value="primary"/>
         <feature spec="host.jvm">
             <param name="jvm" value="default"/>
-            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
         </feature>
     </feature>
 </feature-group-spec>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-secondary.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-secondary.xml
index c9966345a6ce..623ff5bf2bcc 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-secondary.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host-secondary.xml
@@ -13,7 +13,7 @@
         <param name="host" value="secondary"/>
         <feature spec="host.jvm">
             <param name="jvm" value="default"/>
-            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
         </feature>
     </feature>
 </feature-group-spec>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host.xml
index 1e0701876978..7cfeca86f7b5 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/host.xml
@@ -13,7 +13,7 @@
         <param name="host" value="primary"/>
         <feature spec="host.jvm">
             <param name="jvm" value="default"/>
-            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
         </feature>
         <feature spec="host.server-config">
             <param name="server-config" value="server-two"/>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-primary.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-primary.xml
index cc60c5f275b7..67fd671f4bca 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-primary.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-primary.xml
@@ -26,7 +26,7 @@
             <param name="jvm" value="default"/>
             <param name="heap-size" value="64m"/>
             <param name="max-heap-size" value="256m"/>
-            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
             <unset param="environment-variables"/>
         </feature>
     </feature>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-secondary.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-secondary.xml
index 1c965e861271..86f42dba934f 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-secondary.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host-secondary.xml
@@ -14,7 +14,7 @@
                 <param name="jvm" value="default"/>
                 <param name="heap-size" value="64m"/>
                 <param name="max-heap-size" value="256m"/>
-                <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+                <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
                 <unset param="environment-variables"/>
             </feature>
         </include>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host.xml b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host.xml
index 77a9149359f6..b7bc8cbb6d3a 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/feature_groups/servlet-host.xml
@@ -16,7 +16,7 @@
         </feature>
         <feature spec="host.jvm">
             <param name="jvm" value="default"/>
-            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+            <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
         </feature>
         <feature spec="host.server-config">
             <param name="server-config" value="server-two"/>
diff --git a/pom.xml b/pom.xml
index 6c8daeb1c42f..a40926d1511f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
         <!-- Surefire args -->
         <surefire.extra.args></surefire.extra.args>
         <surefire.jpda.args></surefire.jpda.args>
-        <surefire.non-modular.system.args>-ea -Duser.region=US -Duser.language=en -XX:MaxMetaspaceSize=1024m ${surefire.jpda.args} ${surefire.extra.args} ${surefire.jacoco.args}</surefire.non-modular.system.args>
+        <surefire.non-modular.system.args>-ea -Duser.region=US -Duser.language=en ${surefire.jpda.args} ${surefire.extra.args} ${surefire.jacoco.args}</surefire.non-modular.system.args>
         <surefire.system.args>${modular.jdk.args} ${security.manager.props} ${surefire.non-modular.system.args}</surefire.system.args>
         <arquillian.servlet.protocol>Servlet 5.0</arquillian.servlet.protocol>
         <testLogToFile>true</testLogToFile>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
index f486d49d31b8..a12f45877a53 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
@@ -81,7 +81,6 @@
             <jvm-options>
                 <option value="-ea"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml
index be76416e91e7..8f13ca17f21f 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron.xml
@@ -84,7 +84,6 @@
             <jvm-options>
                 <option value="-ea"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/CoreBridgeCallTimeoutTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/CoreBridgeCallTimeoutTestCase.java
index 6459892a540c..7ea5329d0c3e 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/CoreBridgeCallTimeoutTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/CoreBridgeCallTimeoutTestCase.java
@@ -88,7 +88,7 @@ public static void startContainer() {
         System.out.println("jvm.args:" + System.getProperty("jvm.args"));
         System.out.println("basedir:" + System.getProperty("basedir"));
         System.setProperty("jvm.args", ORIGINAL_JVM_ARGS +
-                " -Xmx512m -XX:MaxMetaspaceSize=256m " +
+                " -Xmx512m " +
                 "-Dorg.jboss.byteman.verbose " +
                 "-Djboss.modules.system.pkgs=org.jboss.byteman " +
                 "-Dorg.jboss.byteman.transform.all " +
diff --git a/testsuite/mixed-domain/src/test/resources/primary-config/host-primary-elytron.xml b/testsuite/mixed-domain/src/test/resources/primary-config/host-primary-elytron.xml
index 67c29c482cca..a150eb2bef43 100644
--- a/testsuite/mixed-domain/src/test/resources/primary-config/host-primary-elytron.xml
+++ b/testsuite/mixed-domain/src/test/resources/primary-config/host-primary-elytron.xml
@@ -59,7 +59,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>