diff --git a/osgi-platforms/equinox/src/main/resources/glassfish/osgi/equinox/configuration/config.ini b/osgi-platforms/equinox/src/main/resources/glassfish/osgi/equinox/configuration/config.ini
index 102c63c..24cf270 100644
--- a/osgi-platforms/equinox/src/main/resources/glassfish/osgi/equinox/configuration/config.ini
+++ b/osgi-platforms/equinox/src/main/resources/glassfish/osgi/equinox/configuration/config.ini
@@ -90,27 +90,33 @@ glassfish.osgi.auto.install=${com.sun.aas.installRootURI}modules/endorsed/ \
 core.bundles=${com.sun.aas.installRootURI}modules/osgi-adapter.jar \
              ${com.sun.aas.installRootURI}modules/glassfish.jar
 
-optional.bundles=${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
+osgi-ee.bundles=${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.configadmin.jar \
+                             ${com.sun.aas.installRootURI}modules/autostart/ \
+                             ${com.sun.aas.installRootURI}modules/org.apache.felix.fileinstall.jar
+
+osgi-shell.bundles=\
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.runtime.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.command.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.shell.jar \
-                             ${com.sun.aas.installRootURI}modules/org.apache.felix.shell.remote.jar \
-                             ${com.sun.aas.installRootURI}modules/autostart/ \
-                             ${com.sun.aas.installRootURI}modules/org.apache.felix.fileinstall.jar \
-                     
+                             ${com.sun.aas.installRootURI}modules/org.apache.felix.shell.remote.jar
+
 # This property is used to configure a list of bundles to be started by our autoprocessor.
 # Eventual activation of the bundles depend on bundle's start level and activation policy.
 glassfish.osgi.auto.start=${com.sun.aas.installRootURI}modules/endorsed/ \
-		     ${core.bundles} \
-		     ${optional.bundles}
+                     ${core.bundles} \
+                     ${osgi-ee.bundles} \
+                     ${osgi-shell.bundles}
 
 # List of bundles whose start level is 1
 glassfish.osgi.auto.start.level.1=${core.bundles}
 
 # List of bundles whose start level is 2
 # For start up performance, we don't start optional bundles before start level 2.
-glassfish.osgi.auto.start.level.2=${optional.bundles}
+glassfish.osgi.auto.start.level.2=${osgi-ee.bundles}
+
+# List of bundles whose start level is 3
+glassfish.osgi.auto.start.level.3=${osgi-shell.bundles}
 
 # Final start level of OSGi framework. This is used by GlassFish launcher code
 # to set the start level of the OSGi framework once server is up and running so that
diff --git a/osgi-platforms/felix/src/main/resources/glassfish/osgi/felix/conf/config.properties b/osgi-platforms/felix/src/main/resources/glassfish/osgi/felix/conf/config.properties
index eb8e838..b1020b5 100755
--- a/osgi-platforms/felix/src/main/resources/glassfish/osgi/felix/conf/config.properties
+++ b/osgi-platforms/felix/src/main/resources/glassfish/osgi/felix/conf/config.properties
@@ -116,26 +116,33 @@ glassfish.osgi.auto.install=${com.sun.aas.installRootURI}modules/endorsed/ \
 core.bundles=${com.sun.aas.installRootURI}modules/osgi-adapter.jar \
              ${com.sun.aas.installRootURI}modules/glassfish.jar
 
-optional.bundles=${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
+osgi-ee.bundles=${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.configadmin.jar \
+                             ${com.sun.aas.installRootURI}modules/autostart/ \
+                             ${com.sun.aas.installRootURI}modules/org.apache.felix.fileinstall.jar
+
+osgi-shell.bundles=\
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.runtime.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.command.jar \
                              ${com.sun.aas.installRootURI}modules/org.apache.felix.gogo.shell.jar \
-                             ${com.sun.aas.installRootURI}modules/autostart/ \
-                             ${com.sun.aas.installRootURI}modules/org.apache.felix.fileinstall.jar \
+                             ${com.sun.aas.installRootURI}modules/org.apache.felix.shell.remote.jar
                      
 # This property is used to configure a list of bundles to be started by our autoprocessor.
 # Eventual activation of the bundles depend on bundle's start level and activation policy.
 glassfish.osgi.auto.start=${com.sun.aas.installRootURI}modules/endorsed/ \
 		     ${core.bundles} \
-		     ${optional.bundles}
+		     ${osgi-ee.bundles} \
+		     ${osgi-shell.bundles}
 
 # List of bundles whose start level is 1
 glassfish.osgi.auto.start.level.1=${core.bundles}
 
 # List of bundles whose start level is 2
 # For start up performance, we don't start optional bundles before start level 2.
-glassfish.osgi.auto.start.level.2=${optional.bundles}
+glassfish.osgi.auto.start.level.2=${osgi-ee.bundles}
+
+# List of bundles whose start level is 3
+glassfish.osgi.auto.start.level.3=${osgi-shell.bundles}
 
 # Final start level of OSGi framework. This is used by GlassFish launcher code
 # to set the start level of the OSGi framework once server is up and running so that