diff --git a/archetypes/archetypes/pom.xml b/archetypes/archetypes/pom.xml
index 99d392d90e2..b69deee90e4 100644
--- a/archetypes/archetypes/pom.xml
+++ b/archetypes/archetypes/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -52,7 +52,8 @@
                         <variables>
                             <text path="helidon-version" transient="true">${project.version}</text>
                         </variables>
-                        <exec src="flavor.xml"/>
+                        <exec src="inputs.xml"/>
+                        <exec src="output.xml"/>
                     </entrypoint>
                     <inputFiltersFile>filters.properties</inputFiltersFile>
                     <validations>
diff --git a/archetypes/archetypes/src/main/archetype/common/common.xml b/archetypes/archetypes/src/main/archetype/common/common.xml
deleted file mode 100644
index 4e256f258cf..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/common.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <exec src="multi-module.xml"/>
-    <output>
-        <transformation id="mustache">
-            <replace regex="\.mustache$" replacement=""/>
-        </transformation>
-        <transformation id="packaged">
-            <replace regex="__pkg__" replacement="${package/\./\/}"/>
-        </transformation>
-        <transformation id="json-mustache">
-            <replace regex="\.json.mustache$" replacement=""/>
-        </transformation>
-        <transformation id="jsonp-mustache">
-            <replace regex="\.jsonp.mustache$" replacement=""/>
-        </transformation>
-        <transformation id="multipart-mustache">
-            <replace regex="\.multipart.mustache$" replacement=""/>
-        </transformation>
-        <transformation id="native-image">
-            <replace regex="groupid" replacement="${groupId/\./\/}"/>
-            <replace regex="artifactid" replacement="${artifactId/\./\/}"/>
-        </transformation>
-        <templates engine="mustache" transformations="mustache,packaged">
-            <directory>files</directory>
-            <includes>
-                <include>.helidon.mustache</include>
-                <include>README.md.mustache</include>
-                <include>.gitignore.mustache</include>
-                <include if="${flavor} == 'se'">src/main/java/**/Main.java.mustache</include>
-            </includes>
-        </templates>
-        <model>
-            <value key="dot-helidon-schema-version">1.1.0</value>
-            <list key="dependencies">
-                <map>
-                    <value key="groupId">io.helidon.logging</value>
-                    <value key="artifactId">helidon-logging-jul</value>
-                    <value key="scope">runtime</value>
-                </map>
-            </list>
-        </model>
-    </output>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/customize-project.xml b/archetypes/archetypes/src/main/archetype/common/customize-project.xml
deleted file mode 100644
index 6bc6844e955..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/customize-project.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Customize Project" optional="true">
-        <inputs>
-            <enum id="build-system" name="Select a Build System" default="maven" optional="true">
-                <option value="maven" name="Apache Maven">
-                    <output>
-                        <templates engine="mustache" transformations="mustache,module-dir">
-                            <directory>files</directory>
-                            <includes>
-                                <include>pom.xml.mustache</include>
-                            </includes>
-                        </templates>
-                    </output>
-                </option>
-            </enum>
-            <text id="groupId" name="Project groupId" optional="true" default="com.examples"/>
-            <text id="artifactId" name="Project artifactId" optional="true" default="myproject"/>
-            <text id="version" name="Project version" optional="true" default="1.0-SNAPSHOT"/>
-            <text id="package" name="Java package name" optional="true" default="com.example.myproject"/>
-        </inputs>
-        <output>
-            <model>
-                <value key="parent-groupId" if="!${multi-module}">io.helidon.applications</value>
-                <value key="parent-version" if="!${multi-module}">${helidon-version}</value>
-                <value key="remote-parent-pom" if="!${multi-module}">true</value>
-                <value key="artifactId" if="!${multi-module}">${artifactId}</value>
-                <value key="groupId">${groupId}</value>
-                <value key="project-version">${version}</value>
-                <value key="package">${package}</value>
-            </model>
-        </output>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/docker.xml b/archetypes/archetypes/src/main/archetype/common/docker.xml
deleted file mode 100644
index 2df7165a8c5..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/docker.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <inputs>
-        <boolean id="docker"
-                 name="Docker support"
-                 description="Add a Dockerfile to your project"
-                 default="false"
-                 optional="true">
-            <inputs>
-                <boolean id="native-image"
-                         name="GraalVM Native Image Support"
-                         description="Add a native-image capable Dockerfile to your project"
-                         default="false"
-                         optional="true">
-                    <output>
-                        <templates engine="mustache" transformations="mustache,native-image">
-                            <directory>files</directory>
-                            <includes>
-                                <include>src/*/resources/META-INF/**/*.mustache</include>
-                            </includes>
-                        </templates>
-                        <files if="${flavor} == 'mp' &amp;&amp; ${media.json-lib} == 'jackson'">
-                            <directory>files</directory>
-                            <includes>
-                                <include>src/**/native-image/**/resource-config.json</include>
-                            </includes>
-                        </files>
-                    </output>
-                </boolean>
-                <boolean id="jlink-image" name="JLink Support"
-                         description="Add a JLink capable Dockerfile to your project"
-                         default="false"
-                         optional="true"/>
-            </inputs>
-            <output>
-                <files>
-                    <directory>files</directory>
-                    <includes>
-                        <include>.dockerignore</include>
-                    </includes>
-                </files>
-                <templates engine="mustache" transformations="mustache">
-                    <directory>files</directory>
-                    <includes>
-                        <include>Dockerfile.mustache</include>
-                        <include if="${native-image}">Dockerfile.native.mustache</include>
-                        <include if="${jlink-image}">Dockerfile.jlink.mustache</include>
-                    </includes>
-                </templates>
-                <model>
-                    <list key="poms" if="!${multi-module}">
-                        <value>ADD pom.xml .</value>
-                    </list>
-                    <list key="src-dirs" if="!${multi-module}">
-                        <value>ADD src src</value>
-                    </list>
-                    <list key="native-sections" if="${docker.native-image}">
-                        <value file="files/README.native.md"/>
-                    </list>
-                    <list key="readme-sections">
-                        <value order="50" template="mustache">
-                            <![CDATA[
-## Building the Docker Image
-
-```
-docker build -t {{artifactId}} .
-```
-
-## Running the Docker Image
-
-{{#docker-run-readme-section}}
-{{.}}
-{{/docker-run-readme-section}}
-{{^docker-run-readme-section}}
-```
-docker run --rm -p 8080:8080 {{artifactId}}:latest
-```
-{{/docker-run-readme-section}}
-
-Exercise the application as described above.
-                                ]]>
-                        </value>
-                        <value template="mustache" if="${native-image}">
-                            <![CDATA[
-## Building a Native Image
-
-{{#native-sections}}
-{{.}}
-{{/native-sections}}
-]]>
-                        </value>
-                        <value order="40" template="mustache" if="${jlink-image}">
-                            <![CDATA[
-## Building a Custom Runtime Image
-
-Build the custom runtime image using the jlink image profile:
-
-```
-mvn package -Pjlink-image
-```
-
-This uses the helidon-maven-plugin to perform the custom image generation.
-After the build completes it will report some statistics about the build including the reduction in image size.
-
-The target/{{artifactId}}-jri directory is a self contained custom image of your application. It contains your application,
-its runtime dependencies and the JDK modules it depends on. You can start your application using the provide start script:
-
-```
-./target/{{artifactId}}-jri/bin/start
-```
-
-Class Data Sharing (CDS) Archive
-Also included in the custom image is a Class Data Sharing (CDS) archive that improves your application’s startup
-performance and in-memory footprint. You can learn more about Class Data Sharing in the JDK documentation.
-
-The CDS archive increases your image size to get these performance optimizations. It can be of significant size (tens of MB).
-The size of the CDS archive is reported at the end of the build output.
-
-If you’d rather have a smaller image size (with a slightly increased startup time) you can skip the creation of the CDS
-archive by executing your build like this:
-
-```
-mvn package -Pjlink-image -Djlink.image.addClassDataSharingArchive=false
-```
-
-For more information on available configuration options see the helidon-maven-plugin documentation.
-                                ]]>
-                        </value>
-                    </list>
-                    <list key="docker-phase1-options" if="${~flavor} == 'mp'">
-                        <value>-Declipselink.weave.skip</value>
-                        <value>-DskipOpenApiGenerate</value>
-                    </list>
-                </model>
-            </output>
-        </boolean>
-    </inputs>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/extra.xml b/archetypes/archetypes/src/main/archetype/common/extra.xml
deleted file mode 100644
index d204c0eef95..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/extra.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Extra" optional="true">
-        <inputs>
-            <list id="extra" name="Select Additional Components" optional="true">
-                <option value="webclient" name="WebClient" description="Nima HTTP client" if="${flavor} == 'se'">
-                    <output>
-                        <templates engine="mustache" transformations="mustache,packaged">
-                            <directory>files</directory>
-                            <includes>
-                                <include>src/*/java/**/WebClientMain.java.mustache</include>
-                            </includes>
-                        </templates>
-                        <model>
-                            <list key="dependencies">
-                                <map>
-                                    <value key="groupId">io.helidon.webclient</value>
-                                    <value key="artifactId">helidon-webclient</value>
-                                </map>
-                            </list>
-                            <list key="module-requires">
-                                <value>io.helidon.webclient</value>
-                            </list>
-                            <list key="Abstract-tests">
-                                <value><![CDATA[
-    @Test
-    public void testPerformGetMethod() {
-        String greeting = WebClientMain.performGetMethod(client);
-        assertThat(greeting, containsString("Hello World!"));
-    }
-]]></value>
-                            </list>
-                            <list key="MainTest-static-imports">
-                                <value if="${flavor} == 'se'">org.hamcrest.CoreMatchers.containsString</value>
-                            </list>
-                            <list key="readme-sections" if="${flavor} == 'se'">
-                                <value template="mustache"><![CDATA[
-## Exercise Webclient
-
-First, start the server:
-
-```
-java -jar target/{{artifactId}}.jar
-```
-
-Note the port number that it displays. For example:
-
-```
-WEB server is up! http://localhost:8080/simple-greet
-```
-
-Then run the client, passing the port number. It will connect
-to the server:
-
-```
-java -cp "target/classes:target/libs/*" {{package}}.WebClientMain PORT
-```
-
-]]></value>
-                            </list>
-                        </model>
-                    </output>
-                </option>
-                <option value="fault-tolerance" name="Fault Tolerance" description="System for building resilient applications">
-                    <output>
-                        <templates engine="mustache" transformations="mustache,packaged">
-                            <directory>files</directory>
-                            <includes>
-                                <include if="${flavor} == 'mp'">src/*/java/**/FtResource.java.mustache</include>
-                                <include if="${flavor} == 'mp'">src/*/java/**/FtResourceTest.java.mustache</include>
-                                <include if="${flavor} == 'se'">src/*/java/**/FtService.java.mustache</include>
-                            </includes>
-                        </templates>
-                        <model>
-                            <list key="dependencies" if="${flavor} == 'mp'">
-                                <map>
-                                    <value key="groupId">io.helidon.microprofile</value>
-                                    <value key="artifactId">helidon-microprofile-fault-tolerance</value>
-                                </map>
-                            </list>
-                            <list key="module-requires">
-                                <value if="${flavor} == 'mp'">io.helidon.microprofile.faulttolerance</value>
-                            </list>
-                            <list key="maven-plugins" if="${flavor} == 'mp'">
-                                <value><![CDATA[
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-]]></value>
-                            </list>
-                        </model>
-                    </output>
-                </option>
-                <option value="cors" name="CORS" description="Cross-Origin Resource Sharing utilities">
-                    <output>
-                        <templates engine="mustache" transformations="mustache,packaged">
-                            <directory>files</directory>
-                            <includes>
-                                <include>src/*/java/**/TestCORS.java.mustache</include>
-                            </includes>
-                        </templates>
-                        <model>
-                            <list key="dependencies">
-                                <map if="${flavor} == 'mp'">
-                                    <value key="groupId">io.helidon.microprofile</value>
-                                    <value key="artifactId">helidon-microprofile-cors</value>
-                                </map>
-                                <map if="${flavor} == 'se'">
-                                    <value key="groupId">io.helidon.webserver</value>
-                                    <value key="artifactId">helidon-webserver-cors</value>
-                                </map>
-                                <map if="${flavor} == 'se'">
-                                    <value key="groupId">io.helidon.cors</value>
-                                    <value key="artifactId">helidon-cors</value>
-                                </map>
-                            </list>
-                            <list key="SimpleGreetService-imports" if="${flavor} == 'mp'">
-                                <value>io.helidon.microprofile.cors.CrossOrigin</value>
-                                <value>jakarta.ws.rs.OPTIONS</value>
-                                <value>jakarta.ws.rs.PUT</value>
-                                <value>jakarta.ws.rs.core.Response</value>
-                                <value>jakarta.ws.rs.HttpMethod</value>
-                            </list>
-                            <list key="module-requires">
-                                <value if="${flavor} == 'mp'">io.helidon.microprofile.cors</value>
-                                <value if="${flavor} == 'se'">io.helidon.webserver.cors</value>
-                                <value if="${flavor} == 'se'">io.helidon.cors</value>
-                                <value if="${flavor} == 'se'">java.logging</value>
-                            </list>
-                            <list key="FileServiceTest-annotations" if="${media} contains 'multipart'">
-                                <value if="${flavor} == 'mp'">@AddExtension(CorsCdiExtension.class)</value>
-                            </list>
-                            <list key="FileServiceTest-helidon-imports" if="${media} contains 'multipart'">
-                                <value if="${flavor} == 'mp'">io.helidon.microprofile.cors.CorsCdiExtension</value>
-                            </list>
-                            <list key="SimpleGreetService-methods" if="${flavor} == 'mp'">
-                                <value><![CDATA[
-    @PUT
-    public Response getCustomMessage(String greeting) {
-        String msg = String.format("%s %s!", greeting, "World");
-        return Response.ok(msg).build();
-    }
-
-    /**
-     * CORS set-up for getCustomMessage.
-     */
-    @OPTIONS
-    @CrossOrigin(value = {"http://foo.com", "http://there.com"},
-            allowMethods = {HttpMethod.PUT})
-    public void optionsForGetCustomMessage() {
-    }]]></value>
-                            </list>
-                            <list key="readme-sections" if="${flavor} == 'mp'">
-                                <value><![CDATA[
-## Using CORS
-
-### Sending "simple" CORS requests
-
-The following requests illustrate the CORS protocol with the example app.
-
-By setting `Origin` and `Host` headers that do not indicate the same system we trigger CORS processing in the
- server:
-
-```bash
-# Follow the CORS protocol for GET
-curl -i -X GET -H "Origin: http://foo.com" -H "Host: here.com" http://localhost:8080/cors
-
-HTTP/1.1 200 OK
-Access-Control-Allow-Origin: *
-Content-Type: application/json
-Date: Thu, 30 Apr 2020 17:25:51 -0500
-Vary: Origin
-connection: keep-alive
-content-length: 27
-
-{"greeting":"Hello World!"}
-```
-Note the new headers `Access-Control-Allow-Origin` and `Vary` in the response.
-
-These are what CORS calls "simple" requests; the CORS protocol for these adds headers to the request and response which
-the client and server exchange anyway.
-
-### "Non-simple" CORS requests
-
-The CORS protocol requires the client to send a _pre-flight_ request before sending a request
-that changes state on the server, such as `PUT` or `DELETE`, and to check the returned status
-and headers to make sure the server is willing to accept the actual request. CORS refers to such `PUT` and `DELETE`
-requests as "non-simple" ones.
-
-This command sends a pre-flight `OPTIONS` request to see if the server will accept a subsequent `PUT` request from the
-specified origin to change the greeting:
-```bash
-curl -i -X OPTIONS \
-    -H "Access-Control-Request-Method: PUT" \
-    -H "Origin: http://foo.com" \
-    -H "Host: here.com" \
-    http://localhost:8080/cors/greeting
-
-HTTP/1.1 200 OK
-Access-Control-Allow-Methods: PUT
-Access-Control-Allow-Origin: http://foo.com
-Date: Thu, 30 Apr 2020 17:30:59 -0500
-transfer-encoding: chunked
-connection: keep-alive
-```
-The successful status and the returned `Access-Control-Allow-xxx` headers indicate that the
- server accepted the pre-flight request. That means it is OK for us to send `PUT` request to perform the actual change
- of greeting. (See below for how the server rejects a pre-flight request.)
-```bash
-curl -i -X PUT \
-    -H "Origin: http://foo.com" \
-    -H "Host: here.com" \
-    -H "Access-Control-Allow-Methods: PUT" \
-    -H "Access-Control-Allow-Origin: http://foo.com" \
-    http://localhost:8080/greet/Hola
-
-HTTP/1.1 200 OK
-Access-Control-Allow-Origin: http://foo.com
-Date: Thu, 30 Apr 2020 17:32:55 -0500
-Vary: Origin
-connection: keep-alive
-
-Hola World!
-```
-
-Note that the tests in the example `MainTest` class follow these same steps.
-]]></value>
-                            </list>
-                            <list key="Main-helidon-imports" if="${flavor} == 'se'">
-                                <value>io.helidon.cors.CrossOriginConfig</value>
-                                <value>io.helidon.webserver.cors.CorsSupport</value>
-                            </list>
-                            <list key="Main-java-imports" if="${flavor} == 'se'">
-                                <value>java.util.logging.Logger</value>
-                            </list>
-                            <list key="application-yaml-entries" if="${flavor} == 'se'">
-                                <value><![CDATA[
-restrictive-cors:
-  allow-origins: ["http://foo.com", "http://there.com"]
-  allow-methods: ["PUT", "DELETE"]
-
-# The example app uses the following for overriding other settings.
-#cors:
-#  paths:
-#    - path-pattern: /greeting
-#      allow-origins: ["http://foo.com", "http://there.com", "http://other.com"]
-#      allow-methods: ["PUT", "DELETE"]
-]]></value>
-                            </list>
-                            <list key="Main-routing-builder" if="${flavor} == 'se'">
-                                <value><![CDATA[        .register("/cors-greet", corsSupportForGreeting(), new GreetService())
-]]></value>
-                            </list>
-                            <list key="main-class-content" if="${flavor} == 'se'">
-                                <value><![CDATA[
-    private static CorsSupport corsSupportForGreeting() {
-        Config restrictiveConfig = Config.global().get("restrictive-cors");
-        if (!restrictiveConfig.exists()) {
-            Logger.getLogger(Main.class.getName())
-                    .warning("Missing restrictive config; continuing with default CORS support");
-        }
-
-        CorsSupport.Builder corsBuilder = CorsSupport.builder();
-
-        Config.global().get("cors")
-                .ifExists(c -> {
-                    Logger.getLogger(Main.class.getName()).info("Using the override configuration");
-                    corsBuilder.mappedConfig(c);
-                });
-        corsBuilder
-                .config(restrictiveConfig) // restricted sharing for PUT, DELETE
-                .addCrossOrigin(CrossOriginConfig.create()) // open sharing for other methods
-                .build();
-
-        return corsBuilder.build();
-    }
-]]></value>
-                            </list>
-                            <list key="MainTest-java-imports" if="${flavor} == 'se'">
-                                <value>java.util.Optional</value>
-                            </list>
-                            <list key="MainTest-helidon-imports" if="${flavor} == 'se'">
-                                <value>io.helidon.http.Headers</value>
-                                <value>io.helidon.cors.CrossOriginConfig</value>
-                            </list>
-                            <list key="MainTest-static-imports" if="${flavor} == 'se'">
-                                <value>io.helidon.http.HeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN</value>
-                                <value>io.helidon.http.HeaderNames.HOST</value>
-                                <value>io.helidon.http.HeaderNames.ORIGIN</value>
-                                <value>org.hamcrest.CoreMatchers.containsString</value>
-                            </list>
-                            <list key="Abstract-tests" if="${flavor} == 'se'">
-                                <value><![CDATA[
-    @Test
-    void testAnonymousGreetWithCors() {
-        try (Http1ClientResponse response = client.get()
-                .path("/cors-greet")
-                .headers(it -> it
-                        .set(ORIGIN, "http://foo.com")
-                        .set(HOST, "here.com"))
-                .request()) {
-
-            assertThat(response.status().code(), is(200));
-            String payload = response.entity().as(String.class);
-            assertThat(payload, containsString("Hello World"));
-            Headers responseHeaders = response.headers();
-            Optional<String> allowOrigin = responseHeaders.value(ACCESS_CONTROL_ALLOW_ORIGIN);
-            assertThat("Expected CORS header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN + " is absent",
-                    allowOrigin.isPresent(), is(true));
-            assertThat(allowOrigin.get(), is("*"));
-        }
-    }
-]]></value>
-                            </list>
-                            <list key="readme-sections" if="${flavor} == 'se'">
-                                <value><![CDATA[
-## Using CORS
-
-The following requests illustrate the CORS protocol with the example app.
-
-By setting `Origin` and `Host` headers that do not indicate the same system we trigger CORS processing in the
- server:
-
-```bash
-# Follow the CORS protocol for GET
-curl -i -X GET -H "Origin: http://foo.com" -H "Host: here.com" http://localhost:8080/cors-greet
-
-HTTP/1.1 200 OK
-Access-Control-Allow-Origin: *
-Content-Type: application/json
-Date: Thu, 30 Apr 2020 17:25:51 -0500
-Vary: Origin
-connection: keep-alive
-content-length: 27
-
-Hello World
-```
-]]></value>
-                            </list>
-                        </model>
-                    </output>
-                </option>
-            </list>
-        </inputs>
-        <output>
-            <model>
-                <value key="webclient" if="${extra} contains 'webclient'">true</value>
-                <value key="fault-tolerance" if="${extra} contains 'fault-tolerance'">true</value>
-                <value key="cors" if="${extra} contains 'cors'">true</value>
-            </model>
-        </output>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/archetypes/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache
deleted file mode 100644
index c0963bbfa8d..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/files/src/main/java/__pkg__/Main.java.mustache
+++ /dev/null
@@ -1,37 +0,0 @@
-
-package {{package}};
-
-{{#Main-java-imports}}
-import {{.}};
-{{/Main-java-imports}}
-
-{{#Main-helidon-imports}}
-import {{.}};
-{{/Main-helidon-imports}}
-
-{{#Main-other-imports}}
-import {{.}};
-{{/Main-other-imports}}
-
-{{#Main-static-imports}}
-import {{.}};
-{{/Main-static-imports}}
-
-{{main-class-javadoc}}
-public class Main {
-
-{{#main-class-fields}}
-{{.}}
-{{/main-class-fields}}
-
-    {{main-method-javadoc}}
-    public static void main(String[] args) {
-        {{#main-method-content}}
-        {{.}}
-        {{/main-method-content}}
-    }
-
-{{#main-class-content}}
-{{.}}
-{{/main-class-content}}
-}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/common/media.xml b/archetypes/archetypes/src/main/archetype/common/media.xml
deleted file mode 100644
index 0d520a71db3..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/media.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Media Support" optional="true">
-        <variables>
-            <text path="media.default-json-lib" if="${flavor} == 'mp'">jsonb</text>
-            <text path="media.default-json-lib" if="${flavor} == 'se'">jsonp</text>
-        </variables>
-        <inputs>
-            <!-- TODO https://github.com/oracle/helidon-build-tools/issues/699 -->
-            <list id="media" name="Select Media Support" default="json" optional="true">
-                <option value="json" name="JSON" description="Handle 'application/json' payloads">
-                    <inputs>
-                        <enum id="json-lib" name="Select a JSON library" default="${default-json-lib}" optional="true">
-                            <option value="jsonp" name="JSON-P" description="Jakarta JSON Processing" if="${flavor} == 'se'">
-                                <output>
-                                    <model>
-                                        <list key="MainTest-other-imports">
-                                            <value>jakarta.json.JsonObject</value>
-                                        </list>
-                                        <list key="Abstract-tests">
-                                            <value><![CDATA[
-    @Test
-    void testGreeting() {
-        ClientResponseTyped<JsonObject> response = client.get("/greet").request(JsonObject.class);
-        assertThat(response.status(), is(Status.OK_200));
-        assertThat(response.entity().getString("message"), is("Hello World!"));
-    }
-]]></value>
-                                        </list>
-                                    </model>
-                                </output>
-                            </option>
-                            <option value="jackson" name="Jackson" description="Popular JSON library">
-                                <output>
-                                    <model>
-                                        <list key="dependencies">
-                                            <map order="500">
-                                                <value key="groupId">com.fasterxml.jackson.core</value>
-                                                <value key="artifactId">jackson-databind</value>
-                                            </map>
-                                            <map order="500" if="${flavor} == 'se'">
-                                                <value key="groupId">io.helidon.http.media</value>
-                                                <value key="artifactId">helidon-http-media-jackson</value>
-                                            </map>
-                                            <map order="500" if="${flavor} == 'mp'">
-                                                <value key="groupId">org.glassfish.jersey.media</value>
-                                                <value key="artifactId">jersey-media-json-jackson</value>
-                                                <value key="scope">runtime</value>
-                                            </map>
-                                            <map order="500" if="${flavor} == 'mp'">
-                                                <value key="groupId">jakarta.xml.bind</value>
-                                                <value key="artifactId">jakarta.xml.bind-api</value>
-                                            </map>
-                                        </list>
-                                        <list key="initialize-at-build-time" if="${flavor} == 'mp'">
-                                            <value>com.fasterxml.jackson.core</value>
-                                        </list>
-                                        <list key="module-requires">
-                                            <value>com.fasterxml.jackson.annotation</value>
-                                            <value>com.fasterxml.jackson.core</value>
-                                            <value if="${flavor} == 'mp'">jakarta.xml.bind</value>
-                                        </list>
-                                    </model>
-                                </output>
-                            </option>
-                            <option value="jsonb" name="JSON-B" description="Jakarta JSON Binding">
-                                <output>
-                                    <model>
-                                        <list key="dependencies">
-                                            <map order="500" if="${flavor} != 'se'">
-                                                <value key="groupId">jakarta.json.bind</value>
-                                                <value key="artifactId">jakarta.json.bind-api</value>
-                                            </map>
-                                            <map order="500" if="${flavor} == 'mp'">
-                                                <value key="groupId">org.glassfish.jersey.media</value>
-                                                <value key="artifactId">jersey-media-json-binding</value>
-                                                <value key="scope">runtime</value>
-                                            </map>
-                                            <map order="500" if="${flavor} == 'se'">
-                                                <value key="groupId">io.helidon.http.media</value>
-                                                <value key="artifactId">helidon-http-media-jsonb</value>
-                                            </map>
-                                        </list>
-                                        <list key="Abstract-tests" if="${flavor} == 'se'">
-                                            <value><![CDATA[
-    @Test
-    void testGreet() {
-        ClientResponseTyped<Message> response = client.get("/greet").request(Message.class);
-        assertThat(response.status(), is(Status.OK_200));
-        assertThat(response.entity().getMessage(), is("Hello World!"));
-    }
-
-    @Test
-    void testGreetJoe() {
-        ClientResponseTyped<Message> response = client.get("/greet/Joe").request(Message.class);
-        assertThat(response.status(), is(Status.OK_200));
-        assertThat(response.entity().getMessage(), is("Hello Joe!"));
-    }
-]]></value>
-                                        </list>
-                                        <list key="module-requires">
-                                            <value>jakarta.json.bind</value>
-                                        </list>
-                                    </model>
-                                </output>
-                            </option>
-                        </enum>
-                    </inputs>
-                </option>
-                <option value="multipart" name="MultiPart" description="Handle 'multipart/form-data' payloads">
-                    <output>
-                        <model>
-                            <list key="dependencies">
-                                <map order="500" if="${flavor} == 'mp'">
-                                    <value key="groupId">org.glassfish.jersey.media</value>
-                                    <value key="artifactId">jersey-media-multipart</value>
-                                </map>
-                                <map order="500" if="${flavor} == 'se'">
-                                    <value key="groupId">io.helidon.http.media</value>
-                                    <value key="artifactId">helidon-http-media-multipart</value>
-                                </map>
-                                <map order="500" if="${flavor} == 'se'">
-                                    <value key="groupId">io.helidon.webserver</value>
-                                    <value key="artifactId">helidon-webserver-static-content</value>
-                                </map>
-                            </list>
-                            <list key="module-requires" if="${flavor} == 'se'">
-                                <value>io.helidon.http.media.multipart</value>
-                                <value>io.helidon.webserver.staticcontent</value>
-                            </list>
-                            <list key="module-requires" if="${flavor} == 'mp'">
-                                <value>jersey.media.multipart</value>
-                            </list>
-                            <list key="module-opens" if="${flavor} == 'se'">
-                                <value>WEB</value>
-                            </list>
-                            <list key="Main-helidon-imports" if="${flavor} == 'se'">
-                                <value>io.helidon.http.Status</value>
-                                <value>io.helidon.http.HeaderNames</value>
-                                <value>io.helidon.http.HeaderValues</value>
-                                <value>io.helidon.webserver.staticcontent.StaticContentService</value>
-                            </list>
-                            <list key="Main-routing-builder" if="${flavor} == 'se'">
-                                <value order="1"><![CDATA[.any("/", (req, res) -> {
-                    res.status(Status.MOVED_PERMANENTLY_301);
-                    res.header(HeaderValues.createCached(HeaderNames.LOCATION, "/ui"));
-                    res.send();
-                })
-                .register("/ui", StaticContentService.builder("WEB")
-                        .welcomeFileName("index.html")
-                        .build())
-                .register("/api", new FileService())]]></value>
-                            </list>
-                            <list key="Abstract-tests">
-                            <value><![CDATA[
-    @Test
-    void testFileService() {
-        try (Http1ClientResponse response = client.get("/api").request()) {
-            assertThat(response.status(), is(Status.OK_200));
-        }
-    }
-]]></value>
-                            </list>
-                            <list key="module-requires">
-                                <value if="${flavor} == 'mp'">org.jvnet.mimepull</value>
-                            </list>
-                        </model>
-                    </output>
-                </option>
-            </list>
-        </inputs>
-        <variables>
-            <text path="media.json-lib" if="!(${media} contains 'json')"/>
-        </variables>
-        <output>
-            <!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
-            <model>
-                <value key="media-json" if="${media} contains 'json'">true</value>
-                <value key="media-json" if="!(${media} contains 'json')">false</value>
-                <value key="media-json-jackson" if="${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson'">true</value>
-                <value key="media-json-jackson" if="!(${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson')">false</value>
-                <value key="json-lib" if="${media} contains 'json'">${media.json-lib}</value>
-                <value key="multipart" if="${media} contains 'multipart'">true</value>
-                <list key="readme-exercise-the-application">
-                    <value order="900" if="${media} contains 'json'"><![CDATA[
-JSON:
-```
-curl -X GET http://localhost:8080/greet
-{"message":"Hello World!"}
-
-curl -X GET http://localhost:8080/greet/Joe
-{"message":"Hello Joe!"}
-
-curl -X PUT -H "Content-Type: application/json" -d '{"greeting" : "Hola"}' http://localhost:8080/greet/greeting
-
-curl -X GET http://localhost:8080/greet/Jose
-{"message":"Hola Jose!"}
-```
-]]></value>
-                </list>
-                <list key="dependencies" if="${media} contains 'multipart' || ${media.json-lib} == 'jsonp'">
-                    <map order="500" if="${flavor} == 'se'">
-                        <value key="groupId">jakarta.json</value>
-                        <value key="artifactId">jakarta.json-api</value>
-                    </map>
-                    <map order="500" if="${flavor} == 'se'">
-                        <value key="groupId">io.helidon.http.media</value>
-                        <value key="artifactId">helidon-http-media-jsonp</value>
-                    </map>
-                </list>
-                <list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
-                    <value>jakarta.json</value>
-                </list>
-            </model>
-        </output>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/observability.xml b/archetypes/archetypes/src/main/archetype/common/observability.xml
deleted file mode 100644
index 518af2aa3b6..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/observability.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Observability" optional="true">
-        <inputs>
-            <boolean id="metrics"
-                     name="Metrics"
-                     description="Collect application metrics"
-                     default="false"
-                     optional="true">
-                <inputs>
-                    <enum id="provider"
-                          name="Select a Metrics Provider"
-                          default="microprofile"
-                          optional="true"
-                          if="${flavor} == 'mp'">
-                        <option value="microprofile"
-                                name="MicroProfile"
-                                description="Expose metrics using the MicroProfile API"/>
-                        <option value="micrometer"
-                                name="Micrometer"
-                                description="Expose metrics using the Micrometer API"/>
-                    </enum>
-                    <boolean id="builtin"
-                             name="Built-in Metrics"
-                             description="Expose common metrics"
-                             default="true"
-                             optional="true">
-                        <output>
-                            <model>
-                                <list key="dependencies">
-                                    <map if="${flavor} == 'se'">
-                                        <value key="groupId">io.helidon.webserver.observe</value>
-                                        <value key="artifactId">helidon-webserver-observe-metrics</value>
-                                    </map>
-                                    <map if="${flavor} == 'se'">
-                                        <value key="groupId">io.helidon.metrics</value>
-                                        <value key="artifactId">helidon-metrics-system-meters</value>
-                                        <value key="scope">runtime</value>
-                                    </map>
-                                </list>
-                                <list key="Abstract-tests" if="${flavor} == 'se'">
-                                    <value><![CDATA[
-    @Test
-    void testMetricsObserver() {
-        try (Http1ClientResponse response = client.get("/observe/metrics").request()) {
-            assertThat(response.status(), is(Status.OK_200));
-        }
-    }
-]]></value>
-                                </list>
-                                <list key="module-requires">
-                                    <value if="${flavor} == 'se'">io.helidon.webserver.observe.metrics</value>
-                                    <value if="${flavor} == 'se'">io.helidon.metrics.api</value>
-                                </list>
-                                <list key="readme-sections" if="${flavor} == 'se'">
-                                    <value><![CDATA[
-## Try metrics
-
-```
-# Prometheus Format
-curl -s -X GET http://localhost:8080/observe/metrics
-# TYPE base:gc_g1_young_generation_count gauge
-. . .
-
-# JSON Format
-curl -H 'Accept: application/json' -X GET http://localhost:8080/observe/metrics
-{"base":...
-. . .
-```
-]]></value>
-                                </list>
-                            </model>
-                        </output>
-                    </boolean>
-                </inputs>
-            </boolean>
-            <boolean id="health"
-                     name="Health Checks"
-                     description="Monitor your application’s health"
-                     default="false"
-                     optional="true">
-                <inputs>
-                    <boolean id="builtin"
-                             name="Built-in Health Checks"
-                             description="Report common health check statuses"
-                             default="true"
-                             optional="true">
-                        <output>
-                            <model>
-                                <list key="dependencies" if="${flavor} == 'mp'">
-                                    <map order="800">
-                                        <value key="groupId">io.helidon.microprofile.health</value>
-                                        <value key="artifactId">helidon-microprofile-health</value>
-                                    </map>
-                                </list>
-                                <list key="MainTest-methods" if="${flavor} == 'mp'">
-                                    <value><![CDATA[
-    @Test
-    void testHealth() {
-        Response response = target
-                .path("health")
-                .request()
-                .get();
-        assertThat(response.getStatus(), is(200));
-    }]]></value>
-                                </list>
-                                <list key="readme-sections" if="${flavor} == 'mp'">
-                                    <value><![CDATA[
-## Try health
-
-```
-curl -s -X GET http://localhost:8080/health
-{"outcome":"UP",...
-
-```
-]]></value>
-                                </list>
-                                <list key="dependencies" if="${flavor} == 'se'">
-                                    <map order="800">
-                                        <value key="groupId">io.helidon.webserver.observe</value>
-                                        <value key="artifactId">helidon-webserver-observe-health</value>
-                                    </map>
-                                    <map order="800">
-                                        <value key="groupId">io.helidon.health</value>
-                                        <value key="artifactId">helidon-health-checks</value>
-                                    </map>
-                                </list>
-                                <list key="MainTest-static-imports" if="${flavor} == 'se'">
-                                    <value>org.hamcrest.CoreMatchers.containsString</value>
-                                </list>
-                                <list key="Abstract-test" if="${flavor} == 'se'">
-                                    <value><![CDATA[
-    @Test
-    void testHealth() {
-        try (Http1ClientResponse response = client.get("/observe/health").request()) {
-            assertThat(response.status(), is(Status.OK_200));
-            assertThat(response.as(String.class), containsString("status\":\"UP"));
-        }
-    }
-]]></value>
-                                </list>
-                                <list key="readme-sections" if="${flavor} == 'se'">
-                                    <value><![CDATA[
-## Try health
-
-This example shows the basics of using Helidon SE Health. It uses the
-set of built-in health checks that Helidon provides plus defines a
-custom health check.
-
-Note the port number reported by the application.
-
-Probe the health endpoints:
-
-```bash
-curl -X GET http://localhost:8080/observe/health
-curl -X GET http://localhost:8080/observe/health/ready
-```
-
-]]></value>
-                                </list>
-                                <list key="module-requires" if="${flavor} == 'se'">
-                                    <value>io.helidon.webserver.observe.health</value>
-                                    <value>io.helidon.health.checks</value>
-                                </list>
-                            </model>
-                        </output>
-                    </boolean>
-                </inputs>
-            </boolean>
-            <boolean id="tracing"
-                     name="Tracing"
-                     description="Distributed tracing system"
-                     default="false"
-                     optional="true">
-                <inputs>
-                    <enum id="provider"
-                          name="Select a Tracing Provider"
-                          default="jaeger"
-                          optional="true">
-                        <option value="jaeger"
-                                name="Jaeger"
-                                description="Send traces to a Jaeger backend">
-                            <output>
-                                <model>
-                                    <list key="readme-sections">
-                                        <value file="/common/files/README.jaeger.md"/>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                        <option value="zipkin"
-                                name="Zipkin"
-                                description="Send traces to a Zipkin backend">
-                            <output>
-                                <model>
-                                    <list key="readme-sections">
-                                        <value file="/common/files/README.zipkin.md"/>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                    </enum>
-                </inputs>
-            </boolean>
-        </inputs>
-        <output>
-            <!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
-            <model>
-                <value key="metrics" if="${metrics}">true</value>
-                <value key="metrics.provider" if="${metrics} &amp;&amp; ${flavor} == 'mp'">${metrics.provider}</value>
-                <value key="metrics.builtin" if="${metrics}">${metrics.builtin}</value>
-                <value key="health" if="${health}">true</value>
-                <value key="health.builtin" if="${health}">${health.builtin}</value>
-                <value key="tracing" if="${tracing}">true</value>
-                <value key="tracing.provider" if="${tracing}">${tracing.provider}</value>
-                <list key="dependencies" if="${flavor} == 'mp' &amp;&amp; ${extra} contains 'fault-tolerance'">
-                    <map if="!(${metrics}) || ${metrics.provider} == 'micrometer'">
-                        <value key="groupId">io.helidon.microprofile.metrics</value>
-                        <value key="artifactId">helidon-microprofile-metrics</value>
-                    </map>
-                </list>
-            </model>
-        </output>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/packaging.xml b/archetypes/archetypes/src/main/archetype/common/packaging.xml
deleted file mode 100644
index cd501ad6806..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/packaging.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Packaging and Deployment" optional="true">
-        <exec src="docker.xml"/>
-        <inputs>
-            <boolean id="k8s"
-                     name="Kubernetes Support"
-                     description="Add Kubernetes manifests to your project"
-                     default="false"
-                     optional="true">
-                <output>
-                    <templates engine="mustache" transformations="mustache">
-                        <directory>files</directory>
-                        <includes>
-                            <include>app.yaml.mustache</include>
-                        </includes>
-                    </templates>
-                    <model>
-                    <list key="readme-sections">
-                    <value order="50" template="mustache"><![CDATA[
-## Run the application in Kubernetes
-
-If you don’t have access to a Kubernetes cluster, you can [install one](https://helidon.io/docs/latest/#/about/kubernetes) on your desktop.
-
-### Verify connectivity to cluster
-
-```
-kubectl cluster-info                        # Verify which cluster
-kubectl get pods                            # Verify connectivity to cluster
-```
-{{#k8s-readme-sections}}
-{{#first}}
-
-{{/first}}
-{{.}}
-{{/k8s-readme-sections}}
-
-### Deploy the application to Kubernetes
-
-```
-kubectl create -f app.yaml                              # Deploy application
-kubectl get pods                                        # Wait for quickstart pod to be RUNNING
-kubectl get service  {{artifactId}}                     # Get service info
-kubectl port-forward service/{{artifactId}} 8081:8080   # Forward service port to 8081
-```
-
-You can now exercise the application as you did before but use the port number 8081.
-
-After you’re done, cleanup.
-
-```
-kubectl delete -f app.yaml
-```
-]]>
-                            </value>
-                        </list>
-                    </model>
-                </output>
-            </boolean>
-            <boolean id="v8o"
-                     name="Verrazzano Support"
-                     description="Add Verrazzano manifests to your project"
-                     default="false"
-                     optional="true">
-                <output>
-                    <templates engine="mustache" transformations="mustache">
-                        <directory>files</directory>
-                        <includes>
-                            <include>v8o.yaml.mustache</include>
-                        </includes>
-                    </templates>
-                </output>
-            </boolean>
-            <boolean id="jpms"
-                     name="Module support (JPMS)"
-                     description="Add a module-info to your project"
-                     default="false"
-                     optional="true">
-                <output>
-                    <templates engine="mustache" transformations="mustache,packaged">
-                        <directory>files</directory>
-                        <includes>
-                            <include>src/main/java/**/module-info.java.mustache</include>
-                            <include if="${flavor} == 'mp'">src/main/java/**/Main.java.mustache</include>
-                        </includes>
-                    </templates>
-                </output>
-            </boolean>
-        </inputs>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/security.xml b/archetypes/archetypes/src/main/archetype/common/security.xml
deleted file mode 100644
index 6d5ccf3dfa3..00000000000
--- a/archetypes/archetypes/src/main/archetype/common/security.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Security" optional="true">
-        <inputs>
-            <boolean id="security"
-                     name="Secure Application"
-                     description="Authentication and authorization"
-                     default="false"
-                     optional="true">
-                <inputs>
-                    <list id="atn" name="Select Authentication Providers" optional="true">
-                        <option value="oidc" name="OIDC" description="OpenID Connect"/>
-                        <option value="jwt" name="JWT" description="JSON Web Token">
-                            <output>
-                                <model>
-                                    <list key="module-requires">
-                                        <value>io.helidon.webserver.context</value>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                        <option value="google" name="Google Login" description="Google identity">
-                            <output>
-                                <model>
-                                    <list key="dependencies">
-                                        <map>
-                                            <value key="groupId">io.helidon.security.providers</value>
-                                            <value key="artifactId">helidon-security-providers-google-login</value>
-                                        </map>
-                                    </list>
-                                    <list key="paths-config-entries">
-                                        <value><![CDATA[    - path: "/rest/profile"
-      methods: ["get"]
-      authenticate: true]]></value>
-                                    </list>
-                                    <list key="module-requires">
-                                        <value>io.helidon.webserver.context</value>
-                                        <value>io.helidon.webserver.staticcontent</value>
-                                        <value>io.helidon.security.providers.google.login</value>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                        <option value="http-signature" name="HTTP Signature" description="Service to service authentication">
-                            <output>
-                                <files>
-                                    <directory>files</directory>
-                                    <includes>
-                                        <include>src/main/resources/keystore.p12</include>
-                                    </includes>
-                                </files>
-                                <model>
-                                    <list key="dependencies">
-                                        <map>
-                                            <value key="groupId">io.helidon.security.providers</value>
-                                            <value key="artifactId">helidon-security-providers-http-sign</value>
-                                        </map>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                    </list>
-                    <list id="atz" name="Select Authorization Providers" optional="true">
-                        <option value="abac" name="ABAC" description="Attribute Based Access Control">
-                            <output>
-                                <model>
-                                    <list key="dependencies">
-                                        <map>
-                                            <value key="groupId">io.helidon.security.providers</value>
-                                            <value key="artifactId">helidon-security-providers-abac</value>
-                                        </map>
-                                    </list>
-                                    <list key="paths-config-entries">
-                                        <value order="90" if="!(${security.atn} contains 'oidc')"><![CDATA[         roles-allowed: ["user"]]]></value>
-                                    </list>
-                                </model>
-                            </output>
-                        </option>
-                    </list>
-                </inputs>
-                <output>
-                    <model>
-                        <value key="security">true</value>
-                        <value key="features">true</value>
-                        <list key="server-features">
-                            <value template="mustache"><![CDATA[
-    security:
-      defaults:
-        authenticate: true
-      web-server:
-        # protected paths on the web server - do not include paths served by Jersey, as those are protected directly
-        paths:
-        {{#paths-config-entries}}
-        {{.}}
-        {{/paths-config-entries}}
-]]></value>
-                        </list>
-                    </model>
-                </output>
-            </boolean>
-        </inputs>
-        <variables>
-            <boolean path="application-yaml" if="${security}">true</boolean>
-        </variables>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/customize-project/inputs.xml b/archetypes/archetypes/src/main/archetype/features/customize-project/inputs.xml
new file mode 100644
index 00000000000..c7e28fdfaad
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/customize-project/inputs.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <enum id="build-system" name="Select a Build System" default="maven" optional="true">
+            <option value="maven" name="Apache Maven"/>
+        </enum>
+        <text id="groupId" name="Project groupId" optional="true" default="com.examples"/>
+        <text id="artifactId" name="Project artifactId" optional="true" default="myproject"/>
+        <text id="version" name="Project version" optional="true" default="1.0-SNAPSHOT"/>
+        <text id="package" name="Java package name" optional="true" default="com.example.myproject"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/customize-project/output.xml b/archetypes/archetypes/src/main/archetype/features/customize-project/output.xml
new file mode 100644
index 00000000000..a18768245f1
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/customize-project/output.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output>
+        <model>
+            <value key="parent-groupId" if="!${multi-module}">io.helidon.applications</value>
+            <value key="parent-version" if="!${multi-module}">${helidon-version}</value>
+            <value key="remote-parent-pom" if="!${multi-module}">true</value>
+            <value key="artifactId" if="!${multi-module}">${artifactId}</value>
+            <value key="groupId">${groupId}</value>
+            <value key="project-version">${version}</value>
+            <value key="package">${package}</value>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/multi-module.xml b/archetypes/archetypes/src/main/archetype/features/includes/multi-module-output.xml
similarity index 96%
rename from archetypes/archetypes/src/main/archetype/common/multi-module.xml
rename to archetypes/archetypes/src/main/archetype/features/includes/multi-module-output.xml
index 472b40f06d4..78c8c5e5295 100644
--- a/archetypes/archetypes/src/main/archetype/common/multi-module.xml
+++ b/archetypes/archetypes/src/main/archetype/features/includes/multi-module-output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/archetypes/archetypes/src/main/archetype/common/files/Dockerfile.jlink.mustache b/archetypes/archetypes/src/main/archetype/features/jlink/files/Dockerfile.jlink.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/Dockerfile.jlink.mustache
rename to archetypes/archetypes/src/main/archetype/features/jlink/files/Dockerfile.jlink.mustache
diff --git a/archetypes/archetypes/src/main/archetype/features/jlink/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/features/jlink/files/README.md.mustache
new file mode 100644
index 00000000000..92e11abd3f7
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/jlink/files/README.md.mustache
@@ -0,0 +1,33 @@
+## Building a Custom Runtime Image
+
+Build the custom runtime image using the jlink image profile:
+
+```
+mvn package -Pjlink-image
+```
+
+This uses the helidon-maven-plugin to perform the custom image generation.
+After the build completes it will report some statistics about the build including the reduction in image size.
+
+The target/{{artifactId}}-jri directory is a self contained custom image of your application. It contains your application,
+its runtime dependencies and the JDK modules it depends on. You can start your application using the provide start script:
+
+```
+./target/{{artifactId}}-jri/bin/start
+```
+
+Class Data Sharing (CDS) Archive
+Also included in the custom image is a Class Data Sharing (CDS) archive that improves your application’s startup
+performance and in-memory footprint. You can learn more about Class Data Sharing in the JDK documentation.
+
+The CDS archive increases your image size to get these performance optimizations. It can be of significant size (tens of MB).
+The size of the CDS archive is reported at the end of the build output.
+
+If you’d rather have a smaller image size (with a slightly increased startup time) you can skip the creation of the CDS
+archive by executing your build like this:
+
+```
+mvn package -Pjlink-image -Djlink.image.addClassDataSharingArchive=false
+```
+
+For more information on available configuration options see the helidon-maven-plugin documentation.
diff --git a/archetypes/archetypes/src/main/archetype/features/jlink/inputs.xml b/archetypes/archetypes/src/main/archetype/features/jlink/inputs.xml
new file mode 100644
index 00000000000..a900cf459f8
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/jlink/inputs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="jlink-image" name="JLink Support"
+                 description="Add a JLink capable Dockerfile to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/jlink/output.xml b/archetypes/archetypes/src/main/archetype/features/jlink/output.xml
new file mode 100644
index 00000000000..ccc09688dfb
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/jlink/output.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${docker}">
+        <templates engine="mustache" transformations="mustache" if="${docker.jlink-image}">
+            <directory>files</directory>
+            <includes>
+                <include>Dockerfile.jlink.mustache</include>
+            </includes>
+        </templates>
+        <model if="${docker.jlink-image}">
+            <list key="readme-sections">
+                <value order="40"
+                       template="mustache"
+                       file="files/README.md.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/kubernetes/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/features/kubernetes/files/README.md.mustache
new file mode 100644
index 00000000000..4d91174943b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/kubernetes/files/README.md.mustache
@@ -0,0 +1,34 @@
+
+## Run the application in Kubernetes
+
+If you don’t have access to a Kubernetes cluster, you can [install one](https://helidon.io/docs/latest/#/about/kubernetes) on your desktop.
+
+### Verify connectivity to cluster
+
+```
+kubectl cluster-info                        # Verify which cluster
+kubectl get pods                            # Verify connectivity to cluster
+```
+{{#k8s-readme-sections}}
+    {{#first}}
+
+    {{/first}}
+    {{.}}
+{{/k8s-readme-sections}}
+
+### Deploy the application to Kubernetes
+
+```
+kubectl create -f app.yaml                              # Deploy application
+kubectl get pods                                        # Wait for quickstart pod to be RUNNING
+kubectl get service  {{artifactId}}                     # Get service info
+kubectl port-forward service/{{artifactId}} 8081:8080   # Forward service port to 8081
+```
+
+You can now exercise the application as you did before but use the port number 8081.
+
+After you’re done, cleanup.
+
+```
+kubectl delete -f app.yaml
+```
diff --git a/archetypes/archetypes/src/main/archetype/common/files/app.yaml.mustache b/archetypes/archetypes/src/main/archetype/features/kubernetes/files/app.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/app.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/features/kubernetes/files/app.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/features/kubernetes/inputs.xml b/archetypes/archetypes/src/main/archetype/features/kubernetes/inputs.xml
new file mode 100644
index 00000000000..02af998fa2e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/kubernetes/inputs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="k8s"
+                 name="Kubernetes Support"
+                 description="Add Kubernetes manifests to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/kubernetes/output.xml b/archetypes/archetypes/src/main/archetype/features/kubernetes/output.xml
new file mode 100644
index 00000000000..039e8b4994c
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/kubernetes/output.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${k8s}">
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>app.yaml.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <list key="readme-sections">
+                <value order="50"
+                       template="mustache"
+                       file="files/README.md.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/pom.xml.mustache b/archetypes/archetypes/src/main/archetype/features/maven/files/pom.xml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/pom.xml.mustache
rename to archetypes/archetypes/src/main/archetype/features/maven/files/pom.xml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/features/maven/output.xml b/archetypes/archetypes/src/main/archetype/features/maven/output.xml
new file mode 100644
index 00000000000..2190a36d715
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/maven/output.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${build-system} == 'maven'">
+        <templates engine="mustache" transformations="mustache,module-dir">
+            <directory>files</directory>
+            <includes>
+                <include>pom.xml.mustache</include>
+            </includes>
+        </templates>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/v8o.yaml.mustache b/archetypes/archetypes/src/main/archetype/features/verrazzano/files/v8o.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/v8o.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/features/verrazzano/files/v8o.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/features/verrazzano/inputs.xml b/archetypes/archetypes/src/main/archetype/features/verrazzano/inputs.xml
new file mode 100644
index 00000000000..89b8e870447
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/verrazzano/inputs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="v8o"
+                 name="Verrazzano Support"
+                 description="Add Verrazzano manifests to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/features/verrazzano/output.xml b/archetypes/archetypes/src/main/archetype/features/verrazzano/output.xml
new file mode 100644
index 00000000000..5dd0e1b8c53
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/features/verrazzano/output.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output if="${v8o}">
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>v8o.yaml.mustache</include>
+            </includes>
+        </templates>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/flavor.xml b/archetypes/archetypes/src/main/archetype/inputs.xml
similarity index 81%
rename from archetypes/archetypes/src/main/archetype/flavor.xml
rename to archetypes/archetypes/src/main/archetype/inputs.xml
index 159fb6cf431..e448aca3dd9 100644
--- a/archetypes/archetypes/src/main/archetype/flavor.xml
+++ b/archetypes/archetypes/src/main/archetype/inputs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -34,21 +34,14 @@
                 <option value="se"
                         name="Helidon SE"
                         description="Programmatic, lean &amp; fast">
-                    <exec src="se/se.xml"/>
+                    <exec src="/nodes/se/inputs.xml"/>
                 </option>
                 <option value="mp"
                         name="Helidon MP"
                         description="Declarative, MicroProfile compliant">
-                    <exec src="mp/mp.xml"/>
+                    <exec src="/nodes/mp/inputs.xml"/>
                 </option>
             </enum>
         </inputs>
     </step>
-    <exec src="common/customize-project.xml"/>
-    <output>
-        <model>
-            <value key="helidon-version">${helidon-version}</value>
-            <value key="flavor">${flavor}</value>
-        </model>
-    </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/database-input.xml b/archetypes/archetypes/src/main/archetype/mp/custom/database-input.xml
deleted file mode 100644
index e8c157260ef..00000000000
--- a/archetypes/archetypes/src/main/archetype/mp/custom/database-input.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2022 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<archetype-script xmlns="https://helidon.io/archetype/2.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <step name="Database" optional="true">
-        <inputs>
-            <boolean id="db"
-                     name="Database Support"
-                     description="Manage data in your application"
-                     default="false"
-                     optional="true">
-                <inputs>
-                    <enum id="jpa-impl" name="Select a JPA Implementation" default="hibernate" optional="true">
-                        <option value="hibernate" name="Hibernate" description="Hibernate Object Relational Mapping" />
-                        <option value="eclipselink" name="EclipseLink" description="Eclipse Persistence Services" />
-                    </enum>
-                    <enum id="cp" name="Select a Connection Pool" default="hikaricp" optional="true">
-                        <option value="hikaricp" name="HikariCP" description="&quot;zero overhead&quot; JDBC connection pool" />
-                        <option value="ucp" name="UCP" description="Universal Connection Pool" />
-                    </enum>
-                    <enum id="server" name="Select a Database Server" default="h2" optional="true">
-                        <option value="h2" name="H2" description="In-memory relational database" />
-                        <option value="mysql" name="MySQL" description="Relational database" />
-                        <option value="oracledb" name="Oracle DB" description="Multi-model database" />
-                    </enum>
-                    <boolean id="auto-ddl" name="Auto DDL" description="Automatic schema initialization" optional="true" />
-                    <text id="pu-name" name="Persistence Unit Name" default="pu1" optional="true"/>
-                    <text id="ds-name" name="Datasource Name" default="ds1" optional="true"/>
-                </inputs>
-            </boolean>
-        </inputs>
-    </step>
-</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/quickstart/files/microprofile-config.properties b/archetypes/archetypes/src/main/archetype/mp/quickstart/files/microprofile-config.properties
deleted file mode 100644
index 71896191a15..00000000000
--- a/archetypes/archetypes/src/main/archetype/mp/quickstart/files/microprofile-config.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Application properties. This is the default greeting
-app.greeting=Hello
diff --git a/archetypes/archetypes/src/main/archetype/common/files/.gitignore.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.gitignore.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/.gitignore.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.gitignore.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/.helidon.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.helidon.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/.helidon.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.helidon.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/.idea/runConfigurations/configuration.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.idea/runConfigurations/configuration.xml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/.idea/runConfigurations/configuration.xml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/.idea/runConfigurations/configuration.xml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/README.md.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/README.md.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/README.md.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/main/java/__pkg__/package-info.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/java/__pkg__/package-info.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/main/java/__pkg__/package-info.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/java/__pkg__/package-info.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/META-INF/beans.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/META-INF/beans.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/META-INF/beans.xml
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/logging.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/main/resources/logging.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/main/resources/logging.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/java/__pkg__/MainTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/test/java/__pkg__/MainTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/java/__pkg__/MainTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/test/resources/META-INF/microprofile-config.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/resources/META-INF/microprofile-config.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/test/resources/META-INF/microprofile-config.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/resources/META-INF/microprofile-config.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/files/src/test/resources/application-test.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/resources/application-test.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/common/files/src/test/resources/application-test.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/files/src/test/resources/application-test.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/common/common-mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/output.xml
similarity index 61%
rename from archetypes/archetypes/src/main/archetype/mp/common/common-mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/common/output.xml
index ed488578cce..6dd36d64d2a 100644
--- a/archetypes/archetypes/src/main/archetype/mp/common/common-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/common/output.xml
@@ -20,19 +20,66 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <exec src="/common/common.xml"/>
-    <source src="/common/sources.xml"/>
+    <exec src="/features/includes/multi-module-output.xml"/>
     <output>
+        <transformation id="mustache">
+            <replace regex="\.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="packaged">
+            <replace regex="__pkg__" replacement="${package/\./\/}"/>
+        </transformation>
+        <transformation id="json-mustache">
+            <replace regex="\.json.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="jsonp-mustache">
+            <replace regex="\.jsonp.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="multipart-mustache">
+            <replace regex="\.multipart.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="native-image">
+            <replace regex="groupid" replacement="${groupId/\./\/}"/>
+            <replace regex="artifactid" replacement="${artifactId/\./\/}"/>
+        </transformation>
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.java.mustache</include>
+            </includes>
+        </templates>
         <templates engine="mustache" transformations="mustache">
             <directory>files</directory>
             <includes>
+                <include>src/*/resources/**/*.mustache</include>
+            </includes>
+        </templates>
+        <files>
+            <directory>files</directory>
+            <includes>
+                <include>src/*/resources/**</include>
+            </includes>
+            <excludes>
+                <exclude>**/*.mustache</exclude>
+            </excludes>
+        </files>
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>.helidon.mustache</include>
+                <include>README.md.mustache</include>
+                <include>.gitignore.mustache</include>
                 <include>.idea/runConfigurations/configuration.xml.mustache</include>
             </includes>
         </templates>
         <model>
             <value key="parent-artifactId">helidon-mp</value>
+            <value key="dot-helidon-schema-version">1.1.0</value>
             <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.logging</value>
+                    <value key="artifactId">helidon-logging-jul</value>
+                    <value key="scope">runtime</value>
+                </map>
                 <map>
                     <value key="groupId">io.smallrye</value>
                     <value key="artifactId">jandex</value>
@@ -63,7 +110,8 @@
                         <id>make-index</id>
                     </execution>
                 </executions>
-            </plugin>]]></value>
+            </plugin>]]>
+                </value>
             </list>
             <list key="MainTest-java-imports">
                 <value>jakarta.inject.Inject</value>
@@ -80,33 +128,6 @@
                 <value>static org.hamcrest.MatcherAssert.assertThat</value>
                 <value>static org.hamcrest.Matchers.is</value>
             </list>
-            <value key="main-class-javadoc"><![CDATA[
-/**
- * Main entry point of the application.
- * <p>
- * Note that this class is required when using modules as the module main class must be in a package that is either exported
- * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
- * <p>
- * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
- */]]></value>
-            <value key="main-method-javadoc"><![CDATA[
-    /**
-     * Main method. Starts CDI (and the application).
-     *
-     * @param args ignored
-     */]]></value>
-            <list key="main-class-fields">
-                <value><![CDATA[
-    /**
-    * Cannot be instantiated.
-    */
-    private Main() {
-    }
-]]></value>
-            </list>
-            <list key="main-method-content">
-                <value><![CDATA[        io.helidon.Main.main(args);]]></value>
-            </list>
         </model>
     </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/cors/files/src/test/java/__pkg__/TestCORS.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/TestCORS.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/cors/files/src/test/java/__pkg__/TestCORS.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/cors/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/cors/output.xml
new file mode 100644
index 00000000000..7c76373454f
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/cors/output.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output if="${extra} contains 'cors'">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/TestCORS.java.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <value key="cors">true</value>
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.microprofile</value>
+                    <value key="artifactId">helidon-microprofile-cors</value>
+                </map>
+            </list>
+            <list key="SimpleGreetService-imports">
+                <value>io.helidon.microprofile.cors.CrossOrigin</value>
+                <value>jakarta.ws.rs.OPTIONS</value>
+                <value>jakarta.ws.rs.PUT</value>
+                <value>jakarta.ws.rs.core.Response</value>
+                <value>jakarta.ws.rs.HttpMethod</value>
+            </list>
+            <list key="FileServiceTest-annotations" if="${media} contains 'multipart'">
+                <value>@AddExtension(CorsCdiExtension.class)</value>
+            </list>
+            <list key="FileServiceTest-helidon-imports" if="${media} contains 'multipart'">
+                <value>io.helidon.microprofile.cors.CorsCdiExtension</value>
+            </list>
+            <list key="SimpleGreetService-methods">
+                <value><![CDATA[
+    @PUT
+    public Response getCustomMessage(String greeting) {
+        String msg = String.format("%s %s!", greeting, "World");
+        return Response.ok(msg).build();
+    }
+
+    /**
+     * CORS set-up for getCustomMessage.
+     */
+    @OPTIONS
+    @CrossOrigin(value = {"http://foo.com", "http://there.com"},
+            allowMethods = {HttpMethod.PUT})
+    public void optionsForGetCustomMessage() {
+    }]]>
+                </value>
+            </list>
+            <list key="readme-sections">
+                <value><![CDATA[
+## Using CORS
+
+### Sending "simple" CORS requests
+
+The following requests illustrate the CORS protocol with the example app.
+
+By setting `Origin` and `Host` headers that do not indicate the same system we trigger CORS processing in the
+ server:
+
+```bash
+# Follow the CORS protocol for GET
+curl -i -X GET -H "Origin: http://foo.com" -H "Host: here.com" http://localhost:8080/cors
+
+HTTP/1.1 200 OK
+Access-Control-Allow-Origin: *
+Content-Type: application/json
+Date: Thu, 30 Apr 2020 17:25:51 -0500
+Vary: Origin
+connection: keep-alive
+content-length: 27
+
+{"greeting":"Hello World!"}
+```
+Note the new headers `Access-Control-Allow-Origin` and `Vary` in the response.
+
+These are what CORS calls "simple" requests; the CORS protocol for these adds headers to the request and response which
+the client and server exchange anyway.
+
+### "Non-simple" CORS requests
+
+The CORS protocol requires the client to send a _pre-flight_ request before sending a request
+that changes state on the server, such as `PUT` or `DELETE`, and to check the returned status
+and headers to make sure the server is willing to accept the actual request. CORS refers to such `PUT` and `DELETE`
+requests as "non-simple" ones.
+
+This command sends a pre-flight `OPTIONS` request to see if the server will accept a subsequent `PUT` request from the
+specified origin to change the greeting:
+```bash
+curl -i -X OPTIONS \
+    -H "Access-Control-Request-Method: PUT" \
+    -H "Origin: http://foo.com" \
+    -H "Host: here.com" \
+    http://localhost:8080/cors/greeting
+
+HTTP/1.1 200 OK
+Access-Control-Allow-Methods: PUT
+Access-Control-Allow-Origin: http://foo.com
+Date: Thu, 30 Apr 2020 17:30:59 -0500
+transfer-encoding: chunked
+connection: keep-alive
+```
+The successful status and the returned `Access-Control-Allow-xxx` headers indicate that the
+ server accepted the pre-flight request. That means it is OK for us to send `PUT` request to perform the actual change
+ of greeting. (See below for how the server rejects a pre-flight request.)
+```bash
+curl -i -X PUT \
+    -H "Origin: http://foo.com" \
+    -H "Host: here.com" \
+    -H "Access-Control-Allow-Methods: PUT" \
+    -H "Access-Control-Allow-Origin: http://foo.com" \
+    http://localhost:8080/greet/Hola
+
+HTTP/1.1 200 OK
+Access-Control-Allow-Origin: http://foo.com
+Date: Thu, 30 Apr 2020 17:32:55 -0500
+Vary: Origin
+connection: keep-alive
+
+Hola World!
+```
+
+Note that the tests in the example `MainTest` class follow these same steps.
+]]>
+                </value>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.microprofile.cors</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/README.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/README.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/README.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/README.md
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/README.md.mustache
new file mode 100644
index 00000000000..b4f1d522861
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/README.md.mustache
@@ -0,0 +1,7 @@
+
+### Database Setup
+
+Start your database before running this example.
+
+Example docker commands to start databases in temporary containers:
+{{start-db}}
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/Pokemon.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/Pokemon.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/Pokemon.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/Pokemon.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonType.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonType.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonType.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonType.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonTypeResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonTypeResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/java/__pkg__/PokemonTypeResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/java/__pkg__/PokemonTypeResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.default b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/init_script.sql.default
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.default
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/init_script.sql.default
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/init_script.sql.oracle
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/init_script.sql.oracle
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/init_script.sql.oracle
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/persistence.xml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/META-INF/persistence.xml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/META-INF/persistence.xml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/hibernate.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/hibernate.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/database/files/src/main/resources/hibernate.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/files/src/main/resources/hibernate.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/inputs.xml
new file mode 100644
index 00000000000..8d384090cf6
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/inputs.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <boolean id="db"
+                 name="Database Support"
+                 description="Manage data in your application"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <enum id="jpa-impl" name="Select a JPA Implementation" default="hibernate" optional="true">
+                    <option value="hibernate" name="Hibernate" description="Hibernate Object Relational Mapping" />
+                    <option value="eclipselink" name="EclipseLink" description="Eclipse Persistence Services" />
+                </enum>
+                <enum id="cp" name="Select a Connection Pool" default="hikaricp" optional="true">
+                    <option value="hikaricp" name="HikariCP" description="&quot;zero overhead&quot; JDBC connection pool" />
+                    <option value="ucp" name="UCP" description="Universal Connection Pool" />
+                </enum>
+                <enum id="server" name="Select a Database Server" default="h2" optional="true">
+                    <option value="h2" name="H2" description="In-memory relational database" />
+                    <option value="mysql" name="MySQL" description="Relational database" />
+                    <option value="oracledb" name="Oracle DB" description="Multi-model database" />
+                </enum>
+                <boolean id="auto-ddl" name="Auto DDL" description="Automatic schema initialization" optional="true" />
+                <text id="pu-name" name="Persistence Unit Name" default="pu1" optional="true"/>
+                <text id="ds-name" name="Datasource Name" default="ds1" optional="true"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/output.xml
similarity index 96%
rename from archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/database/output.xml
index 359ddee62fe..073984526bf 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/database-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/database/output.xml
@@ -24,7 +24,7 @@
         <method name="hibernate">
             <output if="${db.jpa-impl} == 'hibernate'">
                 <templates engine="mustache" transformations="mustache">
-                    <directory>../database/files</directory>
+                    <directory>files</directory>
                     <includes>
                         <include>src/main/resources/**/hibernate.properties.mustache</include>
                     </includes>
@@ -177,19 +177,20 @@
         </method>
         <method name="h2">
             <output if="${db.server} == 'h2'">
-                <file source="../database/files/src/main/resources/META-INF/init_script.sql.default"
+                <file source="files/src/main/resources/META-INF/init_script.sql.default"
                       target="src/main/resources/META-INF/init_script.sql"/>
                 <model>
                     <value key="readme-description">Helidon MP application that uses JPA with an in-memory H2 database.</value>
                     <value key="integration-artifactId">h2</value>
                     <value key="db">H2</value>
-                    <value key="start-db" template="mustache"><![CDATA[
+                    <value key="start-db"><![CDATA[
 H2:
 ```
 docker run --rm --name h2 -p 9092:9082 -p 8082:8082 nemerosa/h2
 ```
 For details, see https://www.h2database.com/html/cheatSheet.html
-]]></value>
+]]>
+                    </value>
                     <list key="main-persistence-properties">
                         <map if="${db.jpa-impl} == 'hibernate'">
                             <value key="name">hibernate.column_ordering_strategy</value>
@@ -265,7 +266,8 @@ For details, see https://www.h2database.com/html/cheatSheet.html
                 .get(JsonArray.class);
         return pokemons.size();
     }
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="main-persistence-properties">
                         <map>
@@ -282,14 +284,14 @@ For details, see https://www.h2database.com/html/cheatSheet.html
         </method>
         <method name="mysql">
             <output if="${db.server} == 'mysql'">
-                <file source="../database/files/src/main/resources/META-INF/init_script.sql.default"
+                <file source="files/src/main/resources/META-INF/init_script.sql.default"
                       target="src/main/resources/META-INF/init_script.sql"/>
                 <model>
                     <value key="helidon-test">false</value>
                     <value key="readme-description">Helidon MP application that uses the dbclient API with MySQL database.</value>
                     <value key="integration-artifactId">helidon-integrations-db-mysql</value>
                     <value key="db">MySQL</value>
-                    <value key="start-db" template="mustache"><![CDATA[
+                    <value key="start-db"><![CDATA[
 MySQL:
 ```
 docker run --rm --name mysql -p 3306:3306 \
@@ -299,7 +301,8 @@ docker run --rm --name mysql -p 3306:3306 \
     -e MYSQL_PASSWORD=changeit \
     mysql:5.7
 ```
-]]></value>
+]]>
+                    </value>
                     <list key="main-persistence-properties">
                         <map if="${db.jpa-impl} == 'hibernate'">
                             <value key="name">hibernate.column_ordering_strategy</value>
@@ -328,7 +331,7 @@ docker run --rm --name mysql -p 3306:3306 \
         </method>
         <method name="oracle">
             <output if="${db.server} == 'oracledb'">
-                <file source="../database/files/src/main/resources/META-INF/init_script.sql.oracle"
+                <file source="files/src/main/resources/META-INF/init_script.sql.oracle"
                       target="src/main/resources/META-INF/init_script.sql"/>
                 <model>
                     <value key="helidon-test">false</value>
@@ -343,7 +346,8 @@ Oracle:
 docker run --rm --name xe -p 1521:1521 -p 8888:8080 wnameless/oracle-xe-11g-r2
 ```
 For details on an Oracle Docker image, see https://github.com/oracle/docker-images/tree/master/OracleDatabase/SingleInstance
-]]></value>
+]]>
+                    </value>
                     <list key="main-persistence-properties">
                         <map if="${db.jpa-impl} == 'hibernate'">
                             <value key="name">hibernate.column_ordering_strategy</value>
@@ -385,7 +389,7 @@ For details on an Oracle Docker image, see https://github.com/oracle/docker-imag
     <call method="oracle" />
     <output>
         <templates engine="mustache" transformations="mustache,packaged">
-            <directory>../database/files</directory>
+            <directory>files</directory>
             <includes>
                 <include>src/main/java/**</include>
                 <include>src/*/resources/*/persistence.xml.mustache</include>
@@ -471,19 +475,15 @@ For details on an Oracle Docker image, see https://github.com/oracle/docker-imag
                 <value>jakarta.transaction</value>
             </list>
             <list key="readme-sections">
-                <value template="mustache"><![CDATA[
-### Database Setup
-
-Start your database before running this example.
-
-Example docker commands to start databases in temporary containers:
-{{start-db}}
-]]></value>
+                <value template="mustache" file="files/README.md.mustache"/>
             </list>
             <list key="gitignore">
                 <value>ObjectStore/</value>
                 <value>PutObjectStoreDirHere/</value>
             </list>
+            <list key="readme-exercise-the-application">
+                <value file="files/README.md"/>
+            </list>
         </model>
     </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/.dockerignore b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/.dockerignore
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/.dockerignore
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/.dockerignore
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.jlink.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.jlink.mustache
new file mode 100644
index 00000000000..4659123c983
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.jlink.mustache
@@ -0,0 +1,35 @@
+
+# 1st stage, build the app
+FROM container-registry.oracle.com/java/jdk-no-fee-term:21 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/{{artifactId}}-jri ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/common/files/Dockerfile.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/Dockerfile.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/Dockerfile.native.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.native.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/Dockerfile.native.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/Dockerfile.native.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.jlink.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.jlink.mustache
new file mode 100644
index 00000000000..9eeec989e18
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.jlink.mustache
@@ -0,0 +1,34 @@
+
+## Building a Custom Runtime Image
+
+Build the custom runtime image using the jlink image profile:
+
+```
+mvn package -Pjlink-image
+```
+
+This uses the helidon-maven-plugin to perform the custom image generation.
+After the build completes it will report some statistics about the build including the reduction in image size.
+
+The target/{{artifactId}}-jri directory is a self contained custom image of your application. It contains your application,
+its runtime dependencies and the JDK modules it depends on. You can start your application using the provide start script:
+
+```
+./target/{{artifactId}}-jri/bin/start
+```
+
+Class Data Sharing (CDS) Archive
+Also included in the custom image is a Class Data Sharing (CDS) archive that improves your application’s startup
+performance and in-memory footprint. You can learn more about Class Data Sharing in the JDK documentation.
+
+The CDS archive increases your image size to get these performance optimizations. It can be of significant size (tens of MB).
+The size of the CDS archive is reported at the end of the build output.
+
+If you’d rather have a smaller image size (with a slightly increased startup time) you can skip the creation of the CDS
+archive by executing your build like this:
+
+```
+mvn package -Pjlink-image -Djlink.image.addClassDataSharingArchive=false
+```
+
+For more information on available configuration options see the helidon-maven-plugin documentation.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.mustache
new file mode 100644
index 00000000000..254d62d913c
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.mustache
@@ -0,0 +1,19 @@
+
+## Building the Docker Image
+
+```
+docker build -t {{artifactId}} .
+```
+
+## Running the Docker Image
+
+{{#docker-run-readme-section}}
+{{.}}
+{{/docker-run-readme-section}}
+{{^docker-run-readme-section}}
+```
+docker run --rm -p 8080:8080 {{artifactId}}:latest
+```
+{{/docker-run-readme-section}}
+
+Exercise the application as described above.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.native-image.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.native-image.mustache
new file mode 100644
index 00000000000..15b9c34dd0f
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.md.native-image.mustache
@@ -0,0 +1,6 @@
+
+## Building a Native Image
+
+{{#native-sections}}
+{{.}}
+{{/native-sections}}
diff --git a/archetypes/archetypes/src/main/archetype/common/files/README.native.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.native.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/README.native.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/files/README.native.md
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/inputs.xml
new file mode 100644
index 00000000000..931dde89dc4
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/inputs.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="docker"
+                 name="Docker support"
+                 description="Add a Dockerfile to your project"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <exec src="/nodes/mp/features/native-image/inputs.xml"/>
+                <exec src="/features/jlink/inputs.xml"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/output.xml
new file mode 100644
index 00000000000..79667675145
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/docker/output.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${docker}">
+        <files>
+            <directory>files</directory>
+            <includes>
+                <include>.dockerignore</include>
+            </includes>
+        </files>
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>Dockerfile.mustache</include>
+                <include if="${docker.native-image}">Dockerfile.native.mustache</include>
+                <include if="${docker.jlink-image}">Dockerfile.jlink.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <list key="poms" if="!${multi-module}">
+                <value>ADD pom.xml .</value>
+            </list>
+            <list key="src-dirs" if="!${multi-module}">
+                <value>ADD src src</value>
+            </list>
+            <list key="native-sections" if="${docker.native-image}">
+                <value file="files/README.native.md"/>
+            </list>
+            <list key="readme-sections">
+                <value order="50"
+                       template="mustache"
+                       file="files/README.md.mustache"/>
+                <value template="mustache"
+                       if="${docker.native-image}"
+                       file="files/README.md.native-image.mustache"/>
+                <value order="40" template="mustache" if="${docker.jlink-image}"
+                       file="files/README.md.jlink.mustache"/>
+            </list>
+            <list key="docker-phase1-options">
+                <value>-Declipselink.weave.skip</value>
+                <value>-DskipOpenApiGenerate</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FtResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/files/src/main/java/__pkg__/FtResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FtResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/files/src/main/java/__pkg__/FtResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/files/src/test/java/__pkg__/FtResourceTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FtResourceTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/files/src/test/java/__pkg__/FtResourceTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/output.xml
new file mode 100644
index 00000000000..8f95d361a54
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/fault-tolerance/output.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${extra} contains 'fault-tolerance'">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/FtResource.java.mustache</include>
+                <include>src/*/java/**/FtResourceTest.java.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <value key="fault-tolerance">true</value>
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.microprofile</value>
+                    <value key="artifactId">helidon-microprofile-fault-tolerance</value>
+                </map>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.microprofile.faulttolerance</value>
+            </list>
+            <list key="maven-plugins">
+                <value><![CDATA[
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+]]>
+                </value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/inputs.xml
new file mode 100644
index 00000000000..e8557d3fe34
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/inputs.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="health"
+                 name="Health Checks"
+                 description="Monitor your application’s health"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <boolean id="builtin"
+                         name="Built-in Health Checks"
+                         description="Report common health check statuses"
+                         default="true"
+                         optional="true"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/output.xml
new file mode 100644
index 00000000000..a29c9b48c05
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/health/output.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="health">
+            <output>
+                <model>
+                    <value key="health" if="${health}">true</value>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <call method="health"/>
+    <output if="${health}">
+        <model if="${health.builtin}">
+            <value key="health.builtin">${health.builtin}</value>
+            <list key="dependencies">
+                <map order="800">
+                    <value key="groupId">io.helidon.microprofile.health</value>
+                    <value key="artifactId">helidon-microprofile-health</value>
+                </map>
+            </list>
+            <list key="MainTest-methods">
+                <value><![CDATA[
+    @Test
+    void testHealth() {
+        Response response = target
+                .path("health")
+                .request()
+                .get();
+        assertThat(response.getStatus(), is(200));
+    }]]>
+                </value>
+            </list>
+            <list key="readme-sections">
+                <value><![CDATA[
+## Try health
+
+```
+curl -s -X GET http://localhost:8080/health
+{"outcome":"UP",...
+
+```
+]]>
+                </value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/files/src/main/java/__pkg__/Main.java.mustache
new file mode 100644
index 00000000000..b70ff3b6871
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/files/src/main/java/__pkg__/Main.java.mustache
@@ -0,0 +1,50 @@
+
+package {{package}};
+
+{{#Main-java-imports}}
+    TODO - remove all the imports
+    import {{.}};
+{{/Main-java-imports}}
+
+{{#Main-helidon-imports}}
+    import {{.}};
+{{/Main-helidon-imports}}
+
+{{#Main-other-imports}}
+    import {{.}};
+{{/Main-other-imports}}
+
+{{#Main-static-imports}}
+    import {{.}};
+{{/Main-static-imports}}
+
+
+/**
+ * Main entry point of the application.
+ * <p>
+ * Note that this class is required when using modules as the module main class must be in a package that is either exported
+ * or opened by the module, see {@link java.lang.module.ModuleDescriptor#read(java.io.InputStream, java.util.function.Supplier)}.
+ * <p>
+ * This class provides a proper module main class and calls the {@link io.helidon.Main#main(String[]) built-in main class}.
+ */
+public class Main {
+
+
+    /**
+    * Cannot be instantiated.
+    */
+    private Main() {
+    }
+
+
+
+    /**
+     * Main method. Starts CDI (and the application).
+     *
+     * @param args ignored
+     */
+    public static void main(String[] args) {
+                io.helidon.Main.main(args);
+    }
+
+}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/files/src/main/java/module-info.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/src/main/java/module-info.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/files/src/main/java/module-info.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/inputs.xml
new file mode 100644
index 00000000000..e872023244b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/inputs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="jpms"
+                 name="Module support (JPMS)"
+                 description="Add a module-info to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/output.xml
new file mode 100644
index 00000000000..a62295308ad
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/jpms/output.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output if="${jpms}">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/main/java/**/module-info.java.mustache</include>
+                <include>src/main/java/**/Main.java.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <value key="mainClass">${package}.Main</value>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/FileService.java.multipart.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/FileService.java.multipart.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/FileStorage.java.multipart.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/Message.java.json.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/Message.java.json.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/Message.java.json.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/Message.java.json.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/MultiPartFeatureProvider.java.multipart.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/MultiPartFeatureProvider.java.multipart.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/MultiPartFeatureProvider.java.multipart.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/MultiPartFeatureProvider.java.multipart.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.json.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.jsonp.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/main/java/__pkg__/SimpleGreetResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/media/files/src/test/java/__pkg__/FileServiceTest.java.multipart.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/inputs.xml
new file mode 100644
index 00000000000..ba30838745a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/inputs.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <list id="media" name="Select Media Support" default="json" optional="true">
+            <option value="json" name="JSON" description="Handle 'application/json' payloads">
+                <inputs>
+                    <enum id="json-lib" name="Select a JSON library" default="jsonb" optional="true">
+                        <option value="jackson" name="Jackson" description="Popular JSON library"/>
+                        <option value="jsonb" name="JSON-B" description="Jakarta JSON Binding"/>
+                    </enum>
+                </inputs>
+            </option>
+            <option value="multipart" name="MultiPart" description="Handle 'multipart/form-data' payloads"/>
+        </list>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/output.xml
new file mode 100644
index 00000000000..aab0e7e5513
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/media/output.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!--suppress GrazieInspection -->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="jackson">
+            <output if="${media.json-lib} contains 'jackson'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">com.fasterxml.jackson.core</value>
+                            <value key="artifactId">jackson-databind</value>
+                        </map>
+                        <map order="500">
+                            <value key="groupId">org.glassfish.jersey.media</value>
+                            <value key="artifactId">jersey-media-json-jackson</value>
+                            <value key="scope">runtime</value>
+                        </map>
+                        <map order="500">
+                            <value key="groupId">jakarta.xml.bind</value>
+                            <value key="artifactId">jakarta.xml.bind-api</value>
+                        </map>
+                    </list>
+                    <list key="initialize-at-build-time">
+                        <value>com.fasterxml.jackson.core</value>
+                    </list>
+                    <list key="module-requires">
+                        <value>com.fasterxml.jackson.annotation</value>
+                        <value>com.fasterxml.jackson.core</value>
+                        <value>jakarta.xml.bind</value>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="jsonb">
+            <output if="${media.json-lib} contains 'jsonb'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">jakarta.json.bind</value>
+                            <value key="artifactId">jakarta.json.bind-api</value>
+                        </map>
+                        <map order="500">
+                            <value key="groupId">org.glassfish.jersey.media</value>
+                            <value key="artifactId">jersey-media-json-binding</value>
+                            <value key="scope">runtime</value>
+                        </map>
+                    </list>
+                    <list key="module-requires">
+                        <value>jakarta.json.bind</value>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="multipart">
+            <output if="${media} contains 'multipart'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">org.glassfish.jersey.media</value>
+                            <value key="artifactId">jersey-media-multipart</value>
+                        </map>
+                    </list>
+                    
+                    <list key="module-requires">
+                        <value>jersey.media.multipart</value>
+                    </list>
+                    <list key="Abstract-tests">
+                        <value><![CDATA[
+    @Test
+    void testFileService() {
+        try (Http1ClientResponse response = client.get("/api").request()) {
+            assertThat(response.status(), is(Status.OK_200));
+        }
+    }
+]]>
+                        </value>
+                    </list>
+                    <list key="module-requires">
+                        <value>org.jvnet.mimepull</value>
+                    </list>
+                </model>
+            </output>
+        </method>
+    </methods>
+
+    <call method="jackson"/>
+    <call method="jsonb"/>
+    <call method="multipart"/>
+
+    <output>
+        <templates engine="mustache" transformations="mustache,packaged" if="!(${media} contains 'json')">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/SimpleGreetResource.java.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="json-mustache,packaged" if="['jsonb', 'jackson'] contains ${media.json-lib}">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.json.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="multipart-mustache,packaged" if="${media} contains 'multipart'">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.multipart.mustache</include>
+            </includes>
+        </templates>
+        <!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
+        <model>
+            <value key="media-json" if="${media} contains 'json'">true</value>
+            <value key="media-json" if="!(${media} contains 'json')">false</value>
+            <value key="media-json-jackson" if="${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson'">true</value>
+            <value key="media-json-jackson" if="!(${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson')">false</value>
+            <value key="json-lib" if="${media} contains 'json'">${media.json-lib}</value>
+            <value key="multipart" if="${media} contains 'multipart'">true</value>
+            <list key="readme-exercise-the-application">
+                <value order="900" if="${media} contains 'json'"><![CDATA[
+JSON:
+```
+curl -X GET http://localhost:8080/greet
+{"message":"Hello World!"}
+
+curl -X GET http://localhost:8080/greet/Joe
+{"message":"Hello Joe!"}
+
+curl -X PUT -H "Content-Type: application/json" -d '{"greeting" : "Hola"}' http://localhost:8080/greet/greeting
+
+curl -X GET http://localhost:8080/greet/Jose
+{"message":"Hola Jose!"}
+```
+]]>
+                </value>
+            </list>
+            <list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
+                <value>jakarta.json</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/inputs.xml
new file mode 100644
index 00000000000..1deff0c5d9e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/inputs.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="metrics"
+                 name="Metrics"
+                 description="Collect application metrics"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <enum id="provider"
+                      name="Select a Metrics Provider"
+                      default="microprofile"
+                      optional="true">
+                    <option value="microprofile"
+                            name="MicroProfile"
+                            description="Expose metrics using the MicroProfile API"/>
+                    <option value="micrometer"
+                            name="Micrometer"
+                            description="Expose metrics using the Micrometer API"/>
+                </enum>
+                <boolean id="builtin"
+                         name="Built-in Metrics"
+                         description="Expose common metrics"
+                         default="true"
+                         optional="true"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/metrics-micrometer.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/micrometer-output.xml
similarity index 97%
rename from archetypes/archetypes/src/main/archetype/mp/custom/metrics-micrometer.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/micrometer-output.xml
index e9fe2cefc79..e90aa4e255d 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/metrics-micrometer.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/micrometer-output.xml
@@ -106,6 +106,7 @@
     <call method="metric-micrometer"/>
     <output if="${metrics.provider} == 'micrometer'">
         <model>
+            <value key="metrics.provider">${metrics.provider}</value>
             <list key="dependencies">
                 <map>
                     <value key="groupId">io.helidon.microprofile.metrics</value>
@@ -135,9 +136,9 @@
     private static final String PERSONALIZED_GETS_COUNTER_NAME = "personalizedGets";
     private static final String PERSONALIZED_GETS_COUNTER_DESCRIPTION = "Counts personalized GET operations";
     private static final String GETS_TIMER_NAME = "allGets";
-    private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]></value>
+    private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]>
+                </value>
             </list>
-
             <list key="MainTest-java-imports">
                 <value>org.eclipse.microprofile.metrics.Counter</value>
                 <value>org.eclipse.microprofile.metrics.MetricRegistry</value>
@@ -151,7 +152,8 @@
             <list key="MainTest-static-fields">
                 <value><![CDATA[
     @Inject
-    private MetricRegistry registry;]]></value>
+    private MetricRegistry registry;]]>
+                </value>
             </list>
             <list key="MainTest-methods" order="999">
                 <value><![CDATA[
@@ -159,7 +161,8 @@
     static void clear() {
         MetricsFactory.closeAll();
     }
-]]></value>
+]]>
+                </value>
             </list>
             <list key="MainTest-static-imports">
                 <value>static org.junit.jupiter.api.Assertions.assertEquals</value>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/metrics-microprofile.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/microprofile-output.xml
similarity index 96%
rename from archetypes/archetypes/src/main/archetype/mp/custom/metrics-microprofile.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/microprofile-output.xml
index cadbadcebc5..99dbea2cb2a 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/metrics-microprofile.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/metrics/microprofile-output.xml
@@ -115,6 +115,7 @@
     <call method="metric-microprofile"/>
     <output if="${metrics.provider} == 'microprofile'">
         <model>
+            <value key="metrics.provider">${metrics.provider}</value>
             <list key="readme-sections">
                 <value><![CDATA[
 ## Try metrics
@@ -131,7 +132,8 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
 . . .
 ```
 
-]]></value>
+]]>
+                </value>
             </list>
             <list key="dependencies">
                 <map>
@@ -154,7 +156,8 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
     private static final String PERSONALIZED_GETS_COUNTER_NAME = "personalizedGets";
     private static final String PERSONALIZED_GETS_COUNTER_DESCRIPTION = "Counts personalized GET operations";
     private static final String GETS_TIMER_NAME = "allGets";
-    private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]></value>
+    private static final String GETS_TIMER_DESCRIPTION = "Tracks all GET operations";]]>
+                </value>
             </list>
             <list key="MainTest-java-imports">
                 <value>org.eclipse.microprofile.metrics.Counter</value>
@@ -175,12 +178,14 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
     static void clear() {
         MetricsFactory.closeAll();
     }
-]]></value>
+]]>
+                </value>
             </list>
             <list key="MainTest-static-fields">
                 <value><![CDATA[
     @Inject
-    private MetricRegistry registry;]]></value>
+    private MetricRegistry registry;]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>io.helidon.microprofile.metrics</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/Dockerfile.native.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/Dockerfile.native.mustache
new file mode 100644
index 00000000000..4ff85c6391e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/Dockerfile.native.mustache
@@ -0,0 +1,39 @@
+
+# 1st stage, build the app
+FROM ghcr.io/graalvm/graalvm-community:21.0.0-ol9 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
+
+# Do the Maven build!
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
+
+RUN echo "done!"
+
+# 2nd stage, build the runtime image
+FROM scratch
+WORKDIR /helidon
+
+# Copy the binary built in the 1st stage
+COPY --from=build /helidon/target/{{artifactId}} .
+
+ENTRYPOINT ["./{{artifactId}}"]
+
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/README.native.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/README.native.md
new file mode 100644
index 00000000000..13e443e87c5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/README.native.md
@@ -0,0 +1,12 @@
+The generation of native binaries requires an installation of GraalVM 22.1.0+.
+
+You can build a native binary using Maven as follows:
+
+```
+mvn -Pnative-image install -DskipTests
+```
+
+The generation of the executable binary may take a few minutes to complete depending on
+your hardware and operating system. When completed, the executable file will be available
+under the `target` directory and be named after the artifact ID you have chosen during the
+project generation phase.
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/README.native.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/README.native.md.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/README.native.md.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/README.native.md.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/files/src/main/resources/META-INF/native-image/jakarta/xml/bind/jakarta.xml.bind-api/resource-config.json
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/inputs.xml
new file mode 100644
index 00000000000..5b06cf7c311
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/inputs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <boolean id="native-image"
+                 name="GraalVM Native Image Support"
+                 description="Add a native-image capable Dockerfile to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/common/sources.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/output.xml
similarity index 64%
rename from archetypes/archetypes/src/main/archetype/common/sources.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/output.xml
index 91f689d9343..16cd563df41 100644
--- a/archetypes/archetypes/src/main/archetype/common/sources.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/native-image/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,28 +19,18 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <output>
-        <templates engine="mustache" transformations="mustache,packaged">
-            <directory>files</directory>
-            <includes>
-                <include>src/*/java/**/*.java.mustache</include>
-            </includes>
-        </templates>
-        <templates engine="mustache" transformations="mustache">
+    <output if="${docker}">
+        <templates engine="mustache" transformations="mustache,native-image" if="${docker.native-image}">
             <directory>files</directory>
             <includes>
-                <include>src/*/resources/**/*.mustache</include>
+                <include>src/*/resources/META-INF/**/*.mustache</include>
             </includes>
         </templates>
-        <files>
+        <files if= "${media.json-lib} == 'jackson' &amp;&amp; ${docker.native-image}">
             <directory>files</directory>
             <includes>
-                <include>src/*/resources/**</include>
+                <include>src/**/native-image/**/resource-config.json</include>
             </includes>
-            <excludes>
-                <exclude>**/*.mustache</exclude>
-            </excludes>
         </files>
     </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/application.abac.yaml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.abac.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/application.abac.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.abac.yaml
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/application.google.yaml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.google.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/application.google.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.google.yaml
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/application.http-signature.yaml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.http-signature.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/application.http-signature.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.http-signature.yaml
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/application.oidc.yaml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.oidc.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/application.oidc.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/application.oidc.yaml
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/JwtApplication.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/JwtApplication.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/JwtApplication.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/JwtApplication.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/JwtResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/JwtResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/JwtResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/JwtResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/OidcResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/OidcResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/OidcResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/java/__pkg__/OidcResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/resources/application.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/resources/application.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/resources/application.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/resources/application.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/files/src/main/resources/keystore.p12 b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/resources/keystore.p12
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/src/main/resources/keystore.p12
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/files/src/main/resources/keystore.p12
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/inputs.xml
new file mode 100644
index 00000000000..3752a4047e5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/inputs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="security"
+                 name="Secure Application"
+                 description="Authentication and authorization"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <list id="atn" name="Select Authentication Providers" optional="true">
+                    <option value="oidc" name="OIDC" description="OpenID Connect"/>
+                    <option value="jwt" name="JWT" description="JSON Web Token"/>
+                    <option value="google" name="Google Login" description="Google identity"/>
+                    <option value="http-signature" name="HTTP Signature" description="Service to service authentication"/>
+                </list>
+                <list id="atz" name="Select Authorization Providers" optional="true">
+                    <option value="abac" name="ABAC" description="Attribute Based Access Control"/>
+                </list>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/README.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/README.md
new file mode 100644
index 00000000000..11f8d94f10a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/README.md
@@ -0,0 +1,5 @@
+# Legacy folder
+
+This folder exist to keep backward compatibility with generated code from the archetype before 
+the layout refactoring. The plan is to remove and it and merge the content with the matching `output.xml` file
+once the test coverage is much better.
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/abac-output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/abac-output.xml
new file mode 100644
index 00000000000..ed29b599461
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/abac-output.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atz} contains 'abac'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-abac</value>
+                </map>
+            </list>
+            <list key="paths-config-entries">
+                <value order="90" if="!(${security.atn} contains 'oidc')"><![CDATA[         roles-allowed: ["user"]]]></value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/files/config.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/files/config.yaml.mustache
new file mode 100644
index 00000000000..ebbb7ffb4a2
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/files/config.yaml.mustache
@@ -0,0 +1,10 @@
+
+    security:
+      defaults:
+        authenticate: true
+      web-server:
+        # protected paths on the web server - do not include paths served by Jersey, as those are protected directly
+        paths:
+        {{#paths-config-entries}}
+        {{.}}
+        {{/paths-config-entries}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/google-output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/google-output.xml
new file mode 100644
index 00000000000..5cb5e9ee7a4
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/google-output.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atn} contains 'google'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-google-login</value>
+                </map>
+            </list>
+            <list key="paths-config-entries">
+                <value><![CDATA[    - path: "/rest/profile"
+      methods: ["get"]
+      authenticate: true]]>
+                </value>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.webserver.context</value>
+                <value>io.helidon.webserver.staticcontent</value>
+                <value>io.helidon.security.providers.google.login</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/http-signature-output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/http-signature-output.xml
new file mode 100644
index 00000000000..8f588095091
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/http-signature-output.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+
+        <model if="${security.atn} contains 'http-signature'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-http-sign</value>
+                </map>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/jwt-output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/jwt-output.xml
new file mode 100644
index 00000000000..e0cb75641e3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/jwt-output.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atn} contains 'jwt'">
+            <list key="module-requires">
+                <value>io.helidon.webserver.context</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/legacy.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/legacy.xml
new file mode 100644
index 00000000000..57338ebd5f3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/legacy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="jwt-output.xml"/>
+    <exec src="google-output.xml"/>
+    <exec src="http-signature-output.xml"/>
+    <exec src="abac-output.xml"/>
+    <exec src="output.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/output.xml
new file mode 100644
index 00000000000..9dee6e034e9
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/legacy/output.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model>
+            <value key="security">true</value>
+            <value key="features">true</value>
+            <list key="server-features">
+                <value template="mustache" file="files/config.yaml.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/security-outputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/output.xml
similarity index 89%
rename from archetypes/archetypes/src/main/archetype/mp/custom/security-outputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/security/output.xml
index 93aa72fbe53..f894609352b 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/security-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/security/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -50,7 +50,8 @@ This example demonstrates integration with OIDC (Open ID Connect) providers.
 
 To configure it, you need to replace the default values from configuration
 to your tenant and application configuration.
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -92,6 +93,12 @@ to your tenant and application configuration.
         </method>
         <method name="security-signature">
             <output if="${security.atn} contains ['http-signature']">
+                <files>
+                    <directory>files</directory>
+                    <includes>
+                        <include>src/main/resources/keystore.p12</include>
+                    </includes>
+                </files>
                 <model>
                     <list key="providers-config-entries">
                         <value file="files/application.http-signature.yaml"/>
@@ -115,6 +122,12 @@ to your tenant and application configuration.
     <call method="security-google"/>
     <call method="security-signature"/>
     <output>
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/resources/**/application.yaml.mustache</include>
+            </includes>
+        </templates>
         <model>
             <list key="dependencies">
                 <map>
@@ -125,7 +138,8 @@ to your tenant and application configuration.
             <list key="paths-config-entries">
                 <value><![CDATA[    - path: "/simple-greet"
       methods: ["get"]
-      authenticate: true]]></value>
+      authenticate: true]]>
+                </value>
             </list>
         </model>
     </output>
diff --git a/archetypes/archetypes/src/main/archetype/common/files/README.jaeger.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/README.jaeger.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/README.jaeger.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/README.jaeger.md
diff --git a/archetypes/archetypes/src/main/archetype/common/files/README.zipkin.md b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/README.zipkin.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/common/files/README.zipkin.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/README.zipkin.md
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/microprofile-config.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/microprofile-config.properties.mustache
new file mode 100644
index 00000000000..530e274f129
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/microprofile-config.properties.mustache
@@ -0,0 +1,5 @@
+
+#OpenTelemetry
+otel.sdk.disabled=false
+otel.traces.exporter={{tracing.provider}}
+otel.service.name=helidon-tracing-service
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/TracedResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/src/main/java/__pkg__/TracedResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/src/main/java/__pkg__/TracedResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/files/src/main/java/__pkg__/TracedResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/inputs.xml
new file mode 100644
index 00000000000..6bbea87670a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/inputs.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="tracing"
+                 name="Tracing"
+                 description="Distributed tracing system"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <enum id="provider"
+                      name="Select a Tracing Provider"
+                      default="jaeger"
+                      optional="true">
+                    <option value="jaeger"
+                            name="Jaeger"
+                            description="Send traces to a Jaeger backend"/>
+                    <option value="zipkin"
+                            name="Zipkin"
+                            description="Send traces to a Zipkin backend"/>
+                </enum>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/legacy/legacy.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/legacy/legacy.xml
new file mode 100644
index 00000000000..af7adda1efe
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/legacy/legacy.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="tracing-jaeger">
+            <output if="${tracing.provider} == 'jaeger'">
+                <model>
+                    <list key="readme-sections">
+                        <value file="../files/README.jaeger.md"/>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="tracing-zipkin">
+            <output if="${tracing.provider} == 'zipkin'">
+                <model>
+                    <list key="readme-sections">
+                        <value file="../files/README.zipkin.md"/>
+                    </list>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <call method="tracing-jaeger"/>
+    <call method="tracing-zipkin"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/tracing-outputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/output.xml
similarity index 87%
rename from archetypes/archetypes/src/main/archetype/mp/custom/tracing-outputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/output.xml
index cdeb17729b0..3226afea3f6 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/tracing-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/features/tracing/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
         <method name="tracing-jaeger">
             <output if="${tracing.provider} == 'jaeger'">
                 <model>
+                    <value key="tracing" if="${tracing}">true</value>
+                    <value key="tracing.provider">${tracing.provider}</value>
                     <list key="dependencies">
                         <map order="800">
                             <value key="groupId">io.opentelemetry</value>
@@ -35,6 +37,8 @@
         <method name="tracing-zipkin">
             <output if="${tracing.provider} == 'zipkin'">
                 <model>
+                    <value key="tracing">true</value>
+                    <value key="tracing.provider">${tracing.provider}</value>
                     <list key="dependencies">
                         <map order="800">
                             <value key="groupId">io.opentelemetry</value>
@@ -62,11 +66,7 @@
                 </map>
             </list>
             <list key="microprofile-config-entries">
-                <value template="mustache"><![CDATA[
-#OpenTelemetry
-otel.sdk.disabled=false
-otel.traces.exporter={{tracing.provider}}
-otel.service.name=helidon-tracing-service]]></value>
+                <value template="mustache" file="files/microprofile-config.properties.mustache"/>
             </list>
             <list key="module-requires">
                 <value>io.helidon.microprofile.telemetry</value>
@@ -86,7 +86,8 @@ curl -X GET http://localhost:8080/tracing/custom
   "Custom Span": "SdkSpan{traceId=..."
 }
 ```
-]]></value>
+]]>
+                </value>
             </list>
         </model>
     </output>
diff --git a/archetypes/archetypes/src/main/archetype/mp/mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/inputs.xml
similarity index 83%
rename from archetypes/archetypes/src/main/archetype/mp/mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/inputs.xml
index 9558bcb332e..cd8adbc271b 100644
--- a/archetypes/archetypes/src/main/archetype/mp/mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/inputs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -30,29 +30,24 @@
                 <option value="quickstart"
                         name="Quickstart"
                         description="Sample Helidon MP project that includes multiple REST operations">
-                    <exec src="quickstart/quickstart-mp.xml"/>
+                    <exec src="/nodes/mp/nodes/quickstart/inputs.xml"/>
                 </option>
                 <option value="database"
                         name="Database"
                         description="Helidon MP application that uses a database with JPA">
-                    <exec src="database/database-mp.xml"/>
+                    <exec src="/nodes/mp/nodes/database/inputs.xml"/>
                 </option>
                 <option value="custom"
                         name="Custom"
                         description="Custom Helidon MP project">
-                    <exec src="custom/custom-mp.xml"/>
+                    <exec src="/nodes/mp/nodes/custom/inputs.xml"/>
                 </option>
                 <option value="oci"
                         name="OCI"
                         description="Helidon MP application that integrates with Oracle Cloud Infrastructure">
-                    <exec src="oci/oci-mp.xml"/>
+                    <exec src="/nodes/mp/nodes/oci/inputs.xml"/>
                 </option>
             </enum>
         </inputs>
     </step>
-    <output>
-        <model>
-            <value key="app-type">${app-type}</value>
-        </model>
-    </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/inputs.xml
new file mode 100644
index 00000000000..4ccbbf0c9e3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/inputs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!--suppress GrazieInspection -->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <exec src="/nodes/mp/steps/steps.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/output.xml
similarity index 65%
rename from archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/output.xml
index da43804981e..8724c364151 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/custom-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/custom/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,32 +20,34 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <variables>
-        <boolean path="application-yaml">false</boolean>
-    </variables>
-    <exec src="/mp/common/common-mp.xml"/>
-    <exec src="/common/media.xml"/>
-    <source src="/common/media-sources.xml"/>
-    <exec src="/common/security.xml"/>
-    <exec src="database-input.xml"/>
-    <source src="/common/extra.xml"/>
-    <source src="/common/observability.xml"/>
-    <exec src="/common/packaging.xml"/>
-    <source src="observability.xml"/>
-    <exec src="database-outputs.xml" if="${db}"/>
-    <source src="security-outputs.xml" if="${security}"/>
+    <exec src="/nodes/mp/features/common/output.xml"/>
+    <exec src="/nodes/mp/features/media/output.xml"/>
+    <exec src="/nodes/mp/features/security/legacy/legacy.xml"/>
+    <exec src="/nodes/mp/features/fault-tolerance/output.xml"/>
+    <exec src="/nodes/mp/features/cors/output.xml"/>
+    <exec src="/nodes/mp/features/health/output.xml"/>
+    <exec src="/nodes/mp/features/tracing/legacy/legacy.xml" if="${tracing}"/>
+    <exec src="/nodes/mp/steps/observability-output.xml"/>
+    <exec src="/nodes/mp/features/native-image/output.xml"/>
+    <exec src="/nodes/mp/features/docker/output.xml"/>
+    <exec src="/features/kubernetes/output.xml"/>
+    <exec src="/features/verrazzano/output.xml"/>
+    <exec src="/nodes/mp/features/jpms/output.xml"/>
+    <exec src="/nodes/mp/features/tracing/output.xml" if="${tracing}"/>
+    <exec src="/nodes/mp/features/metrics/microprofile-output.xml" if="${metrics}"/>
+    <exec src="/nodes/mp/features/metrics/micrometer-output.xml" if="${metrics}"/>
+    <exec src="/nodes/mp/features/database/output.xml" if="${db}"/>
+    <exec src="/nodes/mp/features/security/output.xml" if="${security}"/>
+    <exec src="/features/maven/output.xml"/>
+    <exec src="/features/customize-project/output.xml"/>
     <output>
-        <templates engine="mustache" transformations="mustache" if="${application-yaml}">
-            <directory>files</directory>
-            <includes>
-                <include>src/*/resources/**/application.yaml.mustache</include>
-            </includes>
-        </templates>
         <model>
             <value key="helidon-test">true</value>
-            <value key="mainClass" if="${jpms}">${package}.Main</value>
             <list key="microprofile-config-entries">
-                <value file="files/microprofile-config.properties"/>
+                <value><![CDATA[# Application properties. This is the default greeting
+app.greeting=Hello
+]]>
+                </value>
             </list>
             <list key="MainTest-java-imports" if="${media.json-lib} == 'jsonp'">
                 <value>jakarta.json.JsonObject</value>
@@ -59,8 +61,8 @@
                 .request()
                 .get(JsonObject.class);
         assertThat(jsonObject.getString("message"), is("Hello World!"));
-    }
-                ]]></value>
+    }]]>
+                </value>
             </list>
             <list key="MainTest-methods" if="['jsonb', 'jackson'] contains ${media.json-lib}">
                 <value><![CDATA[
@@ -71,8 +73,8 @@
                 .request()
                 .get(Message.class);
         assertThat(message.getMessage(), is("Hello World!"));
-    }
-                ]]></value>
+    }]]>
+                </value>
             </list>
             <list key="dependencies">
                 <map order="1000">
@@ -87,7 +89,8 @@ Basic:
 curl -X GET http://localhost:8080/simple-greet
 Hello World!
 ```
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>jakarta.cdi</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/inputs.xml
new file mode 100644
index 00000000000..6a1bf5a7370
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/inputs.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <presets>
+        <list path="media">
+            <value>json</value>
+        </list>
+        <boolean path="metrics">true</boolean>
+        <enum path="metrics.provider">microprofile</enum>
+        <boolean path="metrics.builtin">true</boolean>
+        <boolean path="health">true</boolean>
+        <boolean path="health.builtin">true</boolean>
+        <boolean path="tracing">false</boolean>
+        <list path="extra"/>
+        <boolean path="security">false</boolean>
+        <boolean path="docker">true</boolean>
+        <boolean path="docker.native-image">true</boolean>
+        <boolean path="docker.jlink-image">true</boolean>
+        <boolean path="k8s">true</boolean>
+        <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
+        <boolean path="db">true</boolean>
+    </presets>
+    <exec src="/nodes/mp/nodes/custom/inputs.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/database/database-mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/output.xml
similarity index 75%
rename from archetypes/archetypes/src/main/archetype/mp/database/database-mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/output.xml
index 5a3b9397802..bca8217a642 100644
--- a/archetypes/archetypes/src/main/archetype/mp/database/database-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/database/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,17 +20,11 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <exec src="/common/presets.xml"/>
-    <presets>
-        <boolean path="db">true</boolean>
-    </presets>
-    <exec src="/mp/custom/custom-mp.xml"/>
+    <exec src="/nodes/mp/nodes/custom/output.xml"/>
+    <!--  TODO - Should be removed because selected by h2  -->
     <output>
         <model>
             <value key="readme-description">Helidon MP application that uses JPA with an in-memory H2 database.</value>
-            <list key="readme-exercise-the-application">
-                <value file="files/README.md"/>
-            </list>
         </model>
     </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/README-Description.md b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README-Description.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/README-Description.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README-Description.md
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.docker.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.docker.mustache
new file mode 100644
index 00000000000..e2ab33fa0a3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.docker.mustache
@@ -0,0 +1,5 @@
+
+```
+docker run --rm -p 8080:8080 -v ~/.oci:/root/.oci:ro {{artifactId}}:latest
+```
+This will mount `~/.oci` as a volume in the running docker container.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.run-commands.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.run-commands.mustache
new file mode 100644
index 00000000000..4d5a64f0a08
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/README.md.run-commands.mustache
@@ -0,0 +1,35 @@
+
+### Build the application
+
+1. Build without running a test
+    ```bash
+    mvn clean package -DskipTests
+    ```
+2. Build with run default test profile using mocked unit tests
+    ```bash
+    mvn clean package
+    ```
+3. Build and run `test` test profile that performs authentication for OCI services via .oci config file
+    ```bash
+    mvn clean package -Ptest
+    ```
+4. Build and execute `prod` test profile that performs OCI services authentication via instance
+principal when running it in an oci compute instance.
+    ```bash
+    mvn clean package -Pprod
+    ```
+
+### Run the application
+
+1. Default with no profile will use `config_file,instance_principals,resource_principal` authentication strategy
+    ```bash
+    java -jar server/target/{{artifactId}}.jar
+    ```
+2. `test` profile will use user principal via oci config file authentication
+    ```bash
+    java -Dconfig.profile=test -jar server/target/{{artifactId}}.jar
+    ```
+3. `prod` profile will use instance principal authentication
+    ```bash
+    java -Dconfig.profile=prod -jar server/target/{{artifactId}}.jar
+    ```
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/client/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/client/README.md.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/client/README.md.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/client/README.md.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/client/pom.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/client/pom.xml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/client/pom.xml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/client/pom.xml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-plugins.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-plugins.xml.mustache
new file mode 100644
index 00000000000..0d5b1ae423e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-plugins.xml.mustache
@@ -0,0 +1,48 @@
+            <plugin>
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-server</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${skipOpenApiGenerate}</skip>
+                            <inputSpec>${project.basedir}/../spec/api.yaml</inputSpec>
+                            <generatorName>java-helidon-server</generatorName>
+                            <generateModelTests>false</generateModelTests>
+                            <generateModelDocumentation>false</generateModelDocumentation>
+                            <generateApiTests>false</generateApiTests>
+                            <generateApiDocumentation>false</generateApiDocumentation>
+                            <output>${project.build.directory}/generated-sources/server</output>
+                            <configOptions>
+                                <apiPackage>{{package}}.server.api</apiPackage>
+                                <fullProject>false</fullProject>
+                                <helidonVersion>{{helidon-version}}</helidonVersion>
+                                <library>mp</library>
+                                <modelPackage>{{package}}.server.model</modelPackage>
+                                <serializationLibrary>jackson</serializationLibrary>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*MockedTest</include>
+                    </includes>
+                </configuration>
+            </plugin>
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-profiles.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-profiles.xml.mustache
new file mode 100644
index 00000000000..fd3b60d5013
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/maven-profiles.xml.mustache
@@ -0,0 +1,35 @@
+
+    <profiles>
+        <profile>
+            <id>test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/*ConfigFileTest</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/*InstancePrincipalTest</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/pom.xml.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/pom.xml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/pom.xml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/pom.xml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/README.md.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/README.md.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/README.md.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetLivenessCheck.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetLivenessCheck.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetLivenessCheck.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetLivenessCheck.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetReadinessCheck.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetReadinessCheck.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetReadinessCheck.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetReadinessCheck.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetResource.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetResource.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetResource.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetResource.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetingProvider.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetingProvider.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/GreetingProvider.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/GreetingProvider.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/package-info.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/package-info.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/java/__pkg__/server/package-info.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/java/__pkg__/server/package-info.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/resources/META-INF/microprofile-config-prod.properties b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/resources/META-INF/microprofile-config-prod.properties
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/resources/META-INF/microprofile-config-prod.properties
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/resources/META-INF/microprofile-config-prod.properties
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/resources/META-INF/microprofile-config-test.properties b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/resources/META-INF/microprofile-config-test.properties
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/main/resources/META-INF/microprofile-config-test.properties
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/main/resources/META-INF/microprofile-config-test.properties
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/Common.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/Common.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/Common.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/Common.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceConfigFileTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceInstancePrincipalTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/server/src/test/java/__pkg__/server/GreetResourceMockedTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/spec/README.md b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/spec/README.md
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/spec/README.md
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/spec/README.md
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/files/spec/api.yaml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/spec/api.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/oci/files/spec/api.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/files/spec/api.yaml
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/inputs.xml
new file mode 100644
index 00000000000..1ca6c35380b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/inputs.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="pre-processed-models">
+            <output>
+                <model>
+                    <value key="docker-run-readme-section"
+                           template="mustache"
+                           file="files/README.md.docker.mustache"/>
+                </model>
+            </output>
+        </method>
+        <method name="common">
+            <output>
+                <transformation id="mustache">
+                    <replace regex="\.mustache$" replacement=""/>
+                </transformation>
+                <transformation id="packaged">
+                    <replace regex="__pkg__" replacement="${package/\./\/}"/>
+                </transformation>
+                <transformation id="json-mustache">
+                    <replace regex="\.json.mustache$" replacement=""/>
+                </transformation>
+                <transformation id="jsonp-mustache">
+                    <replace regex="\.jsonp.mustache$" replacement=""/>
+                </transformation>
+                <transformation id="multipart-mustache">
+                    <replace regex="\.multipart.mustache$" replacement=""/>
+                </transformation>
+                <transformation id="native-image">
+                    <replace regex="groupid" replacement="${groupId/\./\/}"/>
+                    <replace regex="artifactid" replacement="${artifactId/\./\/}"/>
+                </transformation>
+                <templates engine="mustache" transformations="mustache,packaged">
+                    <directory>/nodes/mp/features/common/files</directory>
+                    <includes>
+                        <include>.helidon.mustache</include>
+                        <include>README.md.mustache</include>
+                        <include>.gitignore.mustache</include>
+                    </includes>
+                </templates>
+                <model>
+                    <value key="dot-helidon-schema-version">1.1.0</value>
+                    <list key="dependencies">
+                        <map>
+                            <value key="groupId">io.helidon.logging</value>
+                            <value key="artifactId">helidon-logging-jul</value>
+                            <value key="scope">runtime</value>
+                        </map>
+                    </list>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <variables>
+        <text path="module-dir">server</text>
+        <boolean path="multi-module">true</boolean>
+    </variables>
+    <presets>
+        <boolean path="db">false</boolean>
+        <boolean path="docker">true</boolean>
+        <boolean path="docker.native-image">false</boolean>
+        <boolean path="docker.jlink-image">false</boolean>
+        <boolean path="k8s">true</boolean>
+        <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
+    </presets>
+    <call method="pre-processed-models"/>
+    <call method="common"/>
+    <exec src="/features/includes/multi-module-output.xml"/>
+    <exec src="/nodes/mp/steps/packaging.xml"/>
+    <exec src="/nodes/mp/features/docker/output.xml"/>
+    <exec src="/features/kubernetes/output.xml"/>
+    <exec src="/features/verrazzano/output.xml"/>
+    <exec src="/nodes/mp/features/jpms/output.xml"/>
+    <exec src="/nodes/mp/steps/customize-project.xml"/>
+    <exec src="/features/maven/output.xml"/>
+    <exec src="/features/customize-project/output.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/oci/oci-mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/output.xml
similarity index 63%
rename from archetypes/archetypes/src/main/archetype/mp/oci/oci-mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/output.xml
index 5b0d9ea67de..9f1ae97491c 100644
--- a/archetypes/archetypes/src/main/archetype/mp/oci/oci-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/oci/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,40 +19,10 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <methods>
-        <method name="pre-processed-models">
-            <output>
-                <model>
-                    <value key="docker-run-readme-section" template="mustache"><![CDATA[
-```
-docker run --rm -p 8080:8080 -v ~/.oci:/root/.oci:ro {{artifactId}}:latest
-```
-This will mount `~/.oci` as a volume in the running docker container.
-]]>
-                    </value>
-                </model>
-            </output>
-        </method>
-    </methods>
-    <variables>
-        <text path="module-dir">server</text>
-        <boolean path="multi-module">true</boolean>
-    </variables>
-    <presets>
-        <boolean path="db">false</boolean>
-        <boolean path="docker">true</boolean>
-        <boolean path="docker.native-image">false</boolean>
-        <boolean path="docker.jlink-image">false</boolean>
-        <boolean path="k8s">true</boolean>
-        <boolean path="v8o">false</boolean>
-        <boolean path="jpms">false</boolean>
-    </presets>
-    <call method="pre-processed-models"/>
-    <exec src="/common/common.xml"/>
-    <exec src="/common/packaging.xml"/>
+
     <output>
         <templates engine="mustache" transformations="mustache,module-dir">
-            <directory>../custom/files</directory>
+            <directory>../../features/security/files</directory>
             <includes>
                 <include>src/*/resources/**/application.yaml.mustache</include>
             </includes>
@@ -62,9 +32,13 @@ This will mount `~/.oci` as a volume in the running docker container.
             <includes>
                 <include>**/*.mustache</include>
             </includes>
+            <excludes>
+                <exclude>README*.mustache</exclude>
+                <exclude>maven-*.mustache</exclude>
+            </excludes>
         </templates>
         <templates engine="mustache" transformations="mustache,packaged,module-dir">
-            <directory>../common/files</directory>
+            <directory>../../features/common/files</directory>
             <includes>
                 <include>src/main/resources/**</include>
             </includes>
@@ -76,7 +50,7 @@ This will mount `~/.oci` as a volume in the running docker container.
                     </map>
                 </list>
                 <list key="microprofile-config-entries">
-                    <value template="mustache"><![CDATA[
+                    <value><![CDATA[
 # Application properties. This is the default greeting
 app.greeting=Hello
 
@@ -89,10 +63,10 @@ oci.logging.id=<your oci custom log id>
 
 # OCI Authentication strategy
 oci.auth-strategy=config-file,instance-principals,resource-principal
-                    ]]></value>
+]]></value>
                 </list>
                 <list key="yaml-config-entries">
-                    <value template="mustache"><![CDATA[
+                    <value><![CDATA[
 # Helidon Metrics to OCI parameters
 ocimetrics:
   # OCI compartment ID where the metrics will be sent
@@ -107,7 +81,8 @@ ocimetrics:
   scopes: [base, vendor, application]
   # Enable or disable metric transmission to OCI. Defaults to true if not specified.
   enabled: true
-                    ]]></value>
+]]>
+                    </value>
                 </list>
                 <list key="oci-logging-entries">
                     <value template="mustache"><![CDATA[
@@ -119,11 +94,12 @@ ocimetrics:
 #
 # Check https://docs.oracle.com/en-us/iaas/Content/Logging/Concepts/custom_logs.htm for more information on how to
 # set up Custom Logs that uses the Unified monitoring agent.
-                    ]]></value>
+]]>
+                    </value>
                 </list>
             </model>
         </templates>
-        <file source="../common/files/src/main/resources/META-INF/beans.xml"
+        <file source="../../features/common/files/src/main/resources/META-INF/beans.xml"
               target="client/src/main/resources/META-INF/beans.xml" />
         <files>
             <directory>files</directory>
@@ -232,132 +208,17 @@ ocimetrics:
                 </map>
             </list>
             <list key="maven-plugins">
-                <value template="mustache"><![CDATA[            <plugin>
-                <groupId>io.smallrye</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-index</id>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.openapitools</groupId>
-                <artifactId>openapi-generator-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-server</id>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipOpenApiGenerate}</skip>
-                            <inputSpec>${project.basedir}/../spec/api.yaml</inputSpec>
-                            <generatorName>java-helidon-server</generatorName>
-                            <generateModelTests>false</generateModelTests>
-                            <generateModelDocumentation>false</generateModelDocumentation>
-                            <generateApiTests>false</generateApiTests>
-                            <generateApiDocumentation>false</generateApiDocumentation>
-                            <output>${project.build.directory}/generated-sources/server</output>
-                            <configOptions>
-                                <apiPackage>{{package}}.server.api</apiPackage>
-                                <fullProject>false</fullProject>
-                                <helidonVersion>{{helidon-version}}</helidonVersion>
-                                <library>mp</library>
-                                <modelPackage>{{package}}.server.model</modelPackage>
-                                <serializationLibrary>jackson</serializationLibrary>
-                            </configOptions>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*MockedTest</include>
-                    </includes>
-                </configuration>
-            </plugin>]]></value>
+                <value template="mustache" file="files/maven-plugins.xml.mustache"/>
             </list>
             <list key="maven-profiles">
-                <value template="mustache"><![CDATA[
-    <profiles>
-        <profile>
-            <id>test</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/*ConfigFileTest</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/*InstancePrincipalTest</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>]]></value>
+                <value template="mustache" file="files/maven-profiles.xml.mustache"/>
             </list>
             <value key="readme-description" file="files/README-Description.md"/>
-            <value key="readme-run-commands" template="mustache">
-                <![CDATA[
-### Build the application
-
-1. Build without running a test
-   ```bash
-   mvn clean package -DskipTests
-   ```
-2. Build with run default test profile using mocked unit tests
-   ```bash
-   mvn clean package
-   ```
-3. Build and run `test` test profile that performs authentication for OCI services via .oci config file
-   ```bash
-   mvn clean package -Ptest
-   ```
-4. Build and execute `prod` test profile that performs OCI services authentication via instance
-principal when running it in an oci compute instance.
-   ```bash
-   mvn clean package -Pprod
-
-### Run the application
-
-1. Default with no profile will use `config-file,instance-principals,resource-principal` authentication strategy
-     ```bash
-     java -jar server/target/{{artifactId}}.jar
-     ```
-2. `test` profile will use user principal via oci config file authentication
-     ```bash
-     java -Dconfig.profile=test -jar server/target/{{artifactId}}.jar
-     ```
-3. `prod` profile will use instance principal authentication
-     ```bash
-     java -Dconfig.profile=prod -jar server/target/{{artifactId}}.jar
-     ```
-            ]]>
-            </value>
+            <value key="readme-run-commands"
+                   template="mustache"
+                   file="files/README.md.run-commands.mustache"/>
             <list key="readme-exercise-the-application">
-                <value template="mustache"><![CDATA[
+                <value><![CDATA[
 1. Use curl to access the client application
    ```
    curl -X GET http://localhost:8080/greet
@@ -377,10 +238,11 @@ principal when running it in an oci compute instance.
    $ curl -X GET  http://localhost:8080/health/ready
    {"outcome":"UP","status":"UP","checks":[{"name":"CustomReadinessCheck","state":"UP","status":"UP","data":{"time":1646361474774}}]}
    ```
-                ]]></value>
+]]>
+                </value>
             </list>
             <list key="k8s-readme-sections">
-                <value template="mustache"><![CDATA[
+                <value><![CDATA[
 ### Configure the application
 
 Make sure, your application has access to your OCI setup. One way, you can do so, if your kubernetes cluster is running locally, is by volume.
@@ -400,7 +262,8 @@ Mount this volume as part of your application containers specification
         - mountPath: /root/.oci
           name: oci-config
 ```
-                                ]]></value>
+]]>
+                </value>
             </list>
             <list key="poms">
                 <value>ADD pom.xml pom.xml</value>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/files/microprofile-config.properties b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/microprofile-config.properties
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/custom/files/microprofile-config.properties
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/microprofile-config.properties
diff --git a/archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetResource.java.json.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetResource.java.json.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetResource.java.json.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetResource.java.json.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetResource.java.jsonp.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetResource.java.jsonp.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetResource.java.jsonp.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetResource.java.jsonp.mustache
diff --git a/archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetingProvider.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetingProvider.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/mp/quickstart/files/src/main/java/__pkg__/GreetingProvider.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/files/src/main/java/__pkg__/GreetingProvider.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/common/media-sources.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/output.xml
similarity index 82%
rename from archetypes/archetypes/src/main/archetype/common/media-sources.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/output.xml
index 5f34067e8b7..d1568dd91a7 100644
--- a/archetypes/archetypes/src/main/archetype/common/media-sources.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/features/media/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
         <templates engine="mustache" transformations="mustache,packaged" if="!(${media} contains 'json')">
             <directory>files</directory>
             <includes>
-                <include>src/*/java/**/SimpleGreetService.java.mustache</include>
-                <include>src/*/java/**/SimpleGreetResource.java.mustache</include>
                 <include>src/*/java/**/GreetService.java.mustache</include>
             </includes>
         </templates>
@@ -41,10 +39,10 @@
                 <include>src/*/java/**/*.json.mustache</include>
             </includes>
         </templates>
-        <templates engine="mustache" transformations="multipart-mustache,packaged" if="${media} contains 'multipart'">
+        <templates engine="mustache" transformations="mustache,packaged">
             <directory>files</directory>
             <includes>
-                <include>src/*/java/**/*.multipart.mustache</include>
+                <include>src/**/*.java.mustache</include>
             </includes>
         </templates>
     </output>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/inputs.xml
new file mode 100644
index 00000000000..6514cb8803e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/inputs.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <presets>
+        <list path="media">
+            <value>json</value>
+        </list>
+        <boolean path="metrics">true</boolean>
+        <enum path="metrics.provider">microprofile</enum>
+        <boolean path="metrics.builtin">true</boolean>
+        <boolean path="health">true</boolean>
+        <boolean path="health.builtin">true</boolean>
+        <boolean path="tracing">false</boolean>
+        <list path="extra"/>
+        <boolean path="security">false</boolean>
+        <boolean path="docker">true</boolean>
+        <boolean path="docker.native-image">true</boolean>
+        <boolean path="docker.jlink-image">true</boolean>
+        <boolean path="k8s">true</boolean>
+        <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
+        <boolean path="db">false</boolean>
+    </presets>
+    <exec src="/nodes/mp/nodes/custom/inputs.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/quickstart/quickstart-mp.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/output.xml
similarity index 91%
rename from archetypes/archetypes/src/main/archetype/mp/quickstart/quickstart-mp.xml
rename to archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/output.xml
index a88e63cc175..45f5686e773 100644
--- a/archetypes/archetypes/src/main/archetype/mp/quickstart/quickstart-mp.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/nodes/quickstart/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,12 +20,8 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <exec src="/common/presets.xml"/>
-    <presets>
-        <boolean path="db">false</boolean>
-    </presets>
-    <exec src="/mp/custom/custom-mp.xml"/>
-    <source src="/common/media-sources.xml"/>
+    <exec src="/nodes/mp/nodes/custom/output.xml"/>
+    <exec src="features/media/output.xml"/>
     <output>
         <templates engine="mustache" transformations="mustache,packaged">
             <directory>files</directory>
@@ -61,7 +57,8 @@
                 .get(JsonObject.class);
         assertThat(jsonObject.getString("message"), is("Hola Jose!"));
     }
-                ]]></value>
+]]>
+                </value>
             </list>
             <list key="MainTest-methods" if="['jsonb', 'jackson'] contains ${media.json-lib}">
                 <value><![CDATA[    @Test
@@ -85,7 +82,8 @@
                 .get(Message.class);
         assertThat(jsonMessage.getMessage(), is("Hola Jose!"));
     }
-                ]]></value>
+]]>
+                </value>
             </list>
             <list key="dependencies">
                 <map order="1000">
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/output.xml
new file mode 100644
index 00000000000..0ec4aead5aa
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/output.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="/nodes/mp/nodes/custom/output.xml"     if="${app-type} == 'custom'"/>
+    <exec src="/nodes/mp/nodes/database/output.xml"   if="${app-type} == 'database'"/>
+    <exec src="/nodes/mp/nodes/oci/output.xml"        if="${app-type} == 'oci'"/>
+    <exec src="/nodes/mp/nodes/quickstart/output.xml" if="${app-type} == 'quickstart'"/>
+    <output>
+        <model>
+            <value key="app-type">${app-type}</value>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/customize-project.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/customize-project.xml
new file mode 100644
index 00000000000..a899e4ec96a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/customize-project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Customize Project" optional="true">
+        <exec src="/features/customize-project/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/database.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/database.xml
new file mode 100644
index 00000000000..dc0c2d0c812
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/database.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Database" optional="true">
+        <exec src="/nodes/mp/features/database/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/extra.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/extra.xml
new file mode 100644
index 00000000000..adee67ac385
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/extra.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Extra" optional="true">
+        <inputs>
+            <list id="extra" name="Select Additional Components" optional="true">
+                <option value="fault-tolerance" name="Fault Tolerance" description="System for building resilient applications"/>
+                <option value="cors" name="CORS" description="Cross-Origin Resource Sharing utilities"/>
+            </list>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/media.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/media.xml
new file mode 100644
index 00000000000..17066a0e08b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/media.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Media Support" optional="true">
+        <exec src="/nodes/mp/features/media/inputs.xml"/>
+        <variables>
+            <text path="media.json-lib" if="!(${media} contains 'json')"/>
+        </variables>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability-output.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability-output.xml
new file mode 100644
index 00000000000..b6e0370cc32
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability-output.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output>
+        <!-- TODO https://github.com/oracle/helidon-build-tools/issues/609 -->
+        <model>
+            <value key="metrics" if="${metrics}">true</value>
+            <list key="dependencies" if="${flavor} == 'mp' &amp;&amp; ${extra} contains 'fault-tolerance'">
+                <map if="!(${metrics}) || ${metrics.provider} == 'micrometer'">
+                    <value key="groupId">io.helidon.microprofile.metrics</value>
+                    <value key="artifactId">helidon-microprofile-metrics</value>
+                </map>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability.xml
new file mode 100644
index 00000000000..c6adaab8ed0
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/observability.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Observability" optional="true">
+        <inputs>
+            <exec src="/nodes/mp/features/metrics/inputs.xml"/>
+            <exec src="/nodes/mp/features/health/inputs.xml"/>
+            <exec src="/nodes/mp/features/tracing/inputs.xml"/>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/packaging.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/packaging.xml
new file mode 100644
index 00000000000..480324e7171
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/packaging.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Packaging and Deployment" optional="true">
+        <exec src="/nodes/mp/features/docker/inputs.xml"/>
+        <inputs>
+            <exec src="/features/kubernetes/inputs.xml"/>
+            <exec src="/features/verrazzano/inputs.xml"/>
+            <exec src="/nodes/mp/features/jpms/inputs.xml"/>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/security.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/security.xml
new file mode 100644
index 00000000000..c5a939c4c91
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Security" optional="true">
+        <exec src="/nodes/mp/features/security/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/mp/steps/steps.xml b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/steps.xml
new file mode 100644
index 00000000000..b5864d8c3fa
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/mp/steps/steps.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="/nodes/mp/steps/media.xml"/>
+    <exec src="/nodes/mp/steps/security.xml"/>
+    <exec src="/nodes/mp/steps/database.xml"/>
+    <exec src="/nodes/mp/steps/extra.xml"/>
+    <exec src="/nodes/mp/steps/observability.xml"/>
+    <exec src="/nodes/mp/steps/packaging.xml"/>
+    <exec src="/nodes/mp/steps/customize-project.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.gitignore.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.gitignore.mustache
new file mode 100644
index 00000000000..d952d72e9c2
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.gitignore.mustache
@@ -0,0 +1,39 @@
+# Compiled class file
+*.class
+
+# Maven
+target/
+.m2/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# IntelliJ Idea
+.idea/*
+!.idea/runConfigurations
+*.iws
+*.ipr
+*.iml
+*.releaseBackup
+atlassian-ide-plugin.xml
+
+# Netbeans
+nbactions.xml
+nb-configuration.xml
+
+# Eclipse
+.settings
+.settings/
+.project
+.classpath
+.factorypath
+
+{{#gitignore}}
+{{.}}
+{{/gitignore}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.helidon.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.helidon.mustache
new file mode 100644
index 00000000000..e4a1bbad842
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/.helidon.mustache
@@ -0,0 +1,6 @@
+#Helidon Project Configuration
+#{{current-date}}
+schema.version={{dot-helidon-schema-version}}
+helidon.version={{helidon-version}}
+project.flavor={{flavor}}
+project.archetype={{app-type}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/README.md.mustache
new file mode 100644
index 00000000000..fa778d0ee47
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/README.md.mustache
@@ -0,0 +1,29 @@
+# {{artifactId}}
+
+{{readme-description}}
+
+## Build and run
+
+{{#readme-run-notes}}
+{{.}}
+{{/readme-run-notes}}
+
+{{#readme-run-commands}}
+{{.}}
+{{/readme-run-commands}}
+{{^readme-run-commands}}
+With JDK21
+```bash
+mvn package
+java -jar target/{{artifactId}}.jar
+```
+{{/readme-run-commands}}
+
+## Exercise the application
+{{#readme-exercise-the-application}}
+{{.}}
+{{/readme-exercise-the-application}}
+
+{{#readme-sections}}
+{{.}}
+{{/readme-sections}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/java/__pkg__/Main.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/java/__pkg__/Main.java.mustache
new file mode 100644
index 00000000000..dc7c0a188b1
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/java/__pkg__/Main.java.mustache
@@ -0,0 +1,78 @@
+
+package {{package}};
+
+{{#Main-java-imports}}
+import {{.}};
+{{/Main-java-imports}}
+
+{{#Main-helidon-imports}}
+import {{.}};
+{{/Main-helidon-imports}}
+
+{{#Main-other-imports}}
+import {{.}};
+{{/Main-other-imports}}
+
+{{#Main-static-imports}}
+import {{.}};
+{{/Main-static-imports}}
+
+{{main-class-javadoc}}
+public class Main {
+
+{{#main-class-fields}}
+{{.}}
+{{/main-class-fields}}
+
+    {{main-method-javadoc}}
+    public static void main(String[] args) {
+
+        // load logging configuration
+        LogConfig.configureRuntime();
+
+        // initialize global config from default configuration
+        Config config = Config.create();
+        Config.global(config);
+
+        {{#Main-main}}
+        {{.}}
+        {{/Main-main}}
+
+        WebServer server = WebServer.builder()
+                .config(config.get("server"))
+                {{#Main-server-builder}}
+                {{.}}
+                {{/Main-server-builder}}
+                .routing(Main::routing)
+                .build()
+                .start();
+
+        {{#Main-after-server}}
+        {{.}}
+        {{/Main-after-server}}
+
+        System.out.println("WEB server is up! http://localhost:" + server.port() + "/simple-greet");
+        {{#Main-logging}}
+        {{.}}
+        {{/Main-logging}}
+        {{#main-method-content}}
+        {{.}}
+        {{/main-method-content}}
+    }
+
+    /**
+     * Updates HTTP Routing.
+     */
+    static void routing(HttpRouting.Builder routing) {
+    {{#Main-routing}}
+    {{.}}
+    {{/Main-routing}}
+    routing
+           {{#Main-routing-builder}}
+           {{.}}{{#last}}; {{/last}}
+           {{/Main-routing-builder}}
+    }
+{{#main-class-content}}
+{{.}}
+{{/main-class-content}}
+}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/main/java/__pkg__/package-info.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/java/__pkg__/package-info.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/main/java/__pkg__/package-info.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/java/__pkg__/package-info.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/resources/application.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/main/resources/application.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/resources/application.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/main/resources/logging.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/resources/logging.properties.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/main/resources/logging.properties.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/main/resources/logging.properties.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/AbstractMainTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/MainIT.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/MainIT.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/MainIT.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/MainIT.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/MainTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/test/java/__pkg__/MainTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/java/__pkg__/MainTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/files/src/test/resources/application-test.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/resources/application-test.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/common/files/src/test/resources/application-test.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/files/src/test/resources/application-test.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/common/common-se.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/output.xml
similarity index 62%
rename from archetypes/archetypes/src/main/archetype/se/common/common-se.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/common/output.xml
index 8aa5442fb25..067cb8bcce0 100644
--- a/archetypes/archetypes/src/main/archetype/se/common/common-se.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/common/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,13 +19,67 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <exec src="/common/common.xml"/>
-    <source src="/common/sources.xml"/>
+    <exec src="/features/includes/multi-module-output.xml"/>
     <output>
+        <transformation id="mustache">
+            <replace regex="\.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="packaged">
+            <replace regex="__pkg__" replacement="${package/\./\/}"/>
+        </transformation>
+        <transformation id="json-mustache">
+            <replace regex="\.json.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="jsonp-mustache">
+            <replace regex="\.jsonp.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="multipart-mustache">
+            <replace regex="\.multipart.mustache$" replacement=""/>
+        </transformation>
+        <transformation id="native-image">
+            <replace regex="groupid" replacement="${groupId/\./\/}"/>
+            <replace regex="artifactid" replacement="${artifactId/\./\/}"/>
+        </transformation>
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.java.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/resources/**/*.mustache</include>
+            </includes>
+        </templates>
+        <files>
+            <directory>files</directory>
+            <includes>
+                <include>src/*/resources/**</include>
+            </includes>
+            <excludes>
+                <exclude>**/*.mustache</exclude>
+            </excludes>
+        </files>
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>.helidon.mustache</include>
+                <include>README.md.mustache</include>
+                <include>.gitignore.mustache</include>
+                <include>src/main/java/**/Main.java.mustache</include>
+            </includes>
+        </templates>
         <model>
+            <value key="dot-helidon-schema-version">1.1.0</value>
             <value key="mainClass">${package}.Main</value>
             <value key="parent-artifactId">helidon-se</value>
             <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.logging</value>
+                    <value key="artifactId">helidon-logging-jul</value>
+                    <value key="scope">runtime</value>
+                </map>
                 <map order="999">
                     <value key="groupId">io.helidon.webserver</value>
                     <value key="artifactId">helidon-webserver</value>
@@ -84,16 +138,19 @@
             </list>
             <list key="application-yaml-entries">
                 <value><![CDATA[app:
-    greeting: "Hello"]]></value>
+    greeting: "Hello"]]>
+                </value>
             </list>
             <value key="main-class-javadoc"><![CDATA[
 /**
  * The application main class.
- */]]></value>
+ */]]>
+            </value>
             <value key="main-method-javadoc"><![CDATA[/**
      * Application main entry point.
      * @param args command line arguments.
-     */]]></value>
+     */]]>
+            </value>
             <list key="main-class-fields">
                 <value order="0"><![CDATA[
     /**
@@ -101,54 +158,8 @@
      */
     private Main() {
     }
-]]></value>
-            </list>
-            <list key="main-method-content">
-                <value template="mustache"><![CDATA[
-        // load logging configuration
-        LogConfig.configureRuntime();
-
-        // initialize global config from default configuration
-        Config config = Config.create();
-        Config.global(config);
-
-        {{#Main-main}}
-        {{.}}
-        {{/Main-main}}
-
-        WebServer server = WebServer.builder()
-                .config(config.get("server"))
-                {{#Main-server-builder}}
-                {{.}}
-                {{/Main-server-builder}}
-                .routing(Main::routing)
-                .build()
-                .start();
-
-        {{#Main-after-server}}
-        {{.}}
-        {{/Main-after-server}}
-
-        System.out.println("WEB server is up! http://localhost:" + server.port() + "/simple-greet");
-        {{#Main-logging}}
-        {{.}}
-        {{/Main-logging}}
-]]></value>
-            </list>
-            <list key="main-class-content">
-                <value template="mustache"><![CDATA[
-    /**
-     * Updates HTTP Routing.
-     */
-    static void routing(HttpRouting.Builder routing) {
-        {{#Main-routing}}
-        {{.}}
-        {{/Main-routing}}
-        routing
-               {{#Main-routing-builder}}
-               {{.}}{{#last}}; {{/last}}
-               {{/Main-routing-builder}}
-    }]]></value>
+]]>
+                </value>
             </list>
         </model>
     </output>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/cors/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/cors/output.xml
new file mode 100644
index 00000000000..c7956c904b1
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/cors/output.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output if="${extra} contains 'cors'">
+        <model>
+            <value key="cors" if="${extra} contains 'cors'">true</value>
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.webserver</value>
+                    <value key="artifactId">helidon-webserver-cors</value>
+                </map>
+                <map>
+                    <value key="groupId">io.helidon.cors</value>
+                    <value key="artifactId">helidon-cors</value>
+                </map>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.webserver.cors</value>
+                <value>io.helidon.cors</value>
+                <value>java.logging</value>
+            </list>
+            
+            <list key="Main-helidon-imports">
+                <value>io.helidon.cors.CrossOriginConfig</value>
+                <value>io.helidon.webserver.cors.CorsSupport</value>
+            </list>
+            <list key="Main-java-imports">
+                <value>java.util.logging.Logger</value>
+            </list>
+            <list key="application-yaml-entries">
+                <value><![CDATA[
+restrictive-cors:
+  allow-origins: ["http://foo.com", "http://there.com"]
+  allow-methods: ["PUT", "DELETE"]
+
+# The example app uses the following for overriding other settings.
+#cors:
+#  paths:
+#    - path-pattern: /greeting
+#      allow-origins: ["http://foo.com", "http://there.com", "http://other.com"]
+#      allow-methods: ["PUT", "DELETE"]
+]]>
+                </value>
+            </list>
+            <list key="Main-routing-builder">
+                <value><![CDATA[        .register("/cors-greet", corsSupportForGreeting(), new GreetService())
+]]>
+                </value>
+            </list>
+            <list key="main-class-content">
+                <value><![CDATA[
+    private static CorsSupport corsSupportForGreeting() {
+        Config restrictiveConfig = Config.global().get("restrictive-cors");
+        if (!restrictiveConfig.exists()) {
+            Logger.getLogger(Main.class.getName())
+                    .warning("Missing restrictive config; continuing with default CORS support");
+        }
+
+        CorsSupport.Builder corsBuilder = CorsSupport.builder();
+
+        Config.global().get("cors")
+                .ifExists(c -> {
+                    Logger.getLogger(Main.class.getName()).info("Using the override configuration");
+                    corsBuilder.mappedConfig(c);
+                });
+        corsBuilder
+                .config(restrictiveConfig) // restricted sharing for PUT, DELETE
+                .addCrossOrigin(CrossOriginConfig.create()) // open sharing for other methods
+                .build();
+
+        return corsBuilder.build();
+    }
+]]>
+                </value>
+            </list>
+            <list key="MainTest-java-imports">
+                <value>java.util.Optional</value>
+            </list>
+            <list key="MainTest-helidon-imports">
+                <value>io.helidon.http.Headers</value>
+                <value>io.helidon.cors.CrossOriginConfig</value>
+            </list>
+            <list key="MainTest-static-imports">
+                <value>io.helidon.http.HeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN</value>
+                <value>io.helidon.http.HeaderNames.HOST</value>
+                <value>io.helidon.http.HeaderNames.ORIGIN</value>
+                <value>org.hamcrest.CoreMatchers.containsString</value>
+            </list>
+            <list key="Abstract-tests">
+                <value><![CDATA[
+    @Test
+    void testAnonymousGreetWithCors() {
+        try (Http1ClientResponse response = client.get()
+                .path("/cors-greet")
+                .headers(it -> it
+                        .set(ORIGIN, "http://foo.com")
+                        .set(HOST, "here.com"))
+                .request()) {
+
+            assertThat(response.status().code(), is(200));
+            String payload = response.entity().as(String.class);
+            assertThat(payload, containsString("Hello World"));
+            Headers responseHeaders = response.headers();
+            Optional<String> allowOrigin = responseHeaders.value(ACCESS_CONTROL_ALLOW_ORIGIN);
+            assertThat("Expected CORS header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN + " is absent",
+                    allowOrigin.isPresent(), is(true));
+            assertThat(allowOrigin.get(), is("*"));
+        }
+    }
+]]>
+                </value>
+            </list>
+            <list key="readme-sections">
+                <value><![CDATA[
+## Using CORS
+
+The following requests illustrate the CORS protocol with the example app.
+
+By setting `Origin` and `Host` headers that do not indicate the same system we trigger CORS processing in the
+ server:
+
+```bash
+# Follow the CORS protocol for GET
+curl -i -X GET -H "Origin: http://foo.com" -H "Host: here.com" http://localhost:8080/cors-greet
+
+HTTP/1.1 200 OK
+Access-Control-Allow-Origin: *
+Content-Type: application/json
+Date: Thu, 30 Apr 2020 17:25:51 -0500
+Vary: Origin
+connection: keep-alive
+content-length: 27
+
+Hello World
+```
+]]>
+                </value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/README.md.mustache
new file mode 100644
index 00000000000..603ca996cc2
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/README.md.mustache
@@ -0,0 +1,8 @@
+
+### Database Setup
+
+In the `pom.xml` and `application.yaml` we provide configuration needed for {{server}} database.
+Start your database before running this example.
+
+Example docker commands to start databases in temporary containers:
+{{start-db}}
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/application-jdbc.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-jdbc.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/application-jdbc.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-jdbc.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/application-mongo.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-mongo.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/application-mongo.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-mongo.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/application-test-jdbc.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-test-jdbc.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/application-test-jdbc.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-test-jdbc.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/application-test-mongo.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-test-mongo.yaml.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/application-test-mongo.yaml.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/application-test-mongo.yaml.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/Pokemon.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/Pokemon.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/Pokemon.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/Pokemon.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonMapper.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonMapper.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonMapper.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonMapper.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonMapperProvider.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonMapperProvider.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonMapperProvider.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonMapperProvider.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonService.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonService.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/java/__pkg__/PokemonService.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/java/__pkg__/PokemonService.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/META-INF/services/io.helidon.dbclient.spi.DbMapperProvider.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/META-INF/services/io.helidon.dbclient.spi.DbMapperProvider.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/META-INF/services/io.helidon.dbclient.spi.DbMapperProvider.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/META-INF/services/io.helidon.dbclient.spi.DbMapperProvider.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/pokemon-types.json b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/pokemon-types.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/pokemon-types.json
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/pokemon-types.json
diff --git a/archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/pokemons.json b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/pokemons.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/database/files/src/main/resources/pokemons.json
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/files/src/main/resources/pokemons.json
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/database/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/inputs.xml
new file mode 100644
index 00000000000..b9afb0aee99
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/inputs.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2023 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <boolean id="db"
+                 name="Database Support"
+                 description="Manage data in your application"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <enum id="server" name="Select a Database Server" default="h2" optional="true">
+                    <option value="h2" name="H2" description="In-memory relational database" />
+                    <option value="mysql" name="MySQL" description="Relational database" />
+                    <option value="oracledb" name="Oracle DB" description="Multi-model database" />
+                    <option value="mongodb" name="MongoDB" description="NoSQL / Document database" />
+                </enum>
+            </inputs>
+        </boolean>
+    </inputs>
+
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/database-output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/output.xml
similarity index 93%
rename from archetypes/archetypes/src/main/archetype/se/custom/database-output.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/database/output.xml
index 7163f50a199..416a446f681 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/database-output.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/database/output.xml
@@ -36,15 +36,17 @@
                     <list key="db-connection">
                         <value><![CDATA[    url: "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=TRUE"
     username: sa
-    password:]]></value>
+    password:]]>
+                        </value>
                     </list>
-                    <value key="start-db" template="mustache"><![CDATA[
+                    <value key="start-db"><![CDATA[
 H2:
 ```
 docker run --rm --name h2 -p 9092:9082 -p 8082:8082 nemerosa/h2
 ```
 For details, see https://www.h2database.com/html/cheatSheet.html
-]]></value>
+]]>
+                    </value>
                 </model>
             </output>
         </method>
@@ -69,9 +71,10 @@ For details, see https://www.h2database.com/html/cheatSheet.html
                     <list key="db-connection">
                         <value><![CDATA[    url: jdbc:mysql://127.0.0.1:3306/pokemon?useSSL=false
     username: user
-    password: changeit]]></value>
+    password: changeit]]>
+                        </value>
                     </list>
-                    <value key="start-db" template="mustache"><![CDATA[
+                    <value key="start-db"><![CDATA[
 MySQL:
 ```
 docker run --rm --name mysql -p 3306:3306 \
@@ -81,7 +84,8 @@ docker run --rm --name mysql -p 3306:3306 \
     -e MYSQL_PASSWORD=changeit \
     mysql:5.7
 ```
-]]></value>
+]]>
+                    </value>
                 </model>
             </output>
         </method>
@@ -102,7 +106,8 @@ docker run --rm --name mysql -p 3306:3306 \
                     <list key="db-connection">
                         <value><![CDATA[    url: jdbc:oracle:thin:@localhost:1521/XE
     username: system
-    password: oracle]]></value>
+    password: oracle]]>
+                        </value>
                     </list>
                     <value key="start-db"><![CDATA[
 Oracle:
@@ -110,7 +115,8 @@ Oracle:
 docker run --rm --name xe -p 1521:1521 -p 8888:8080 wnameless/oracle-xe-11g-r2
 ```
 For details on an Oracle Docker image, see https://github.com/oracle/docker-images/tree/master/OracleDatabase/SingleInstance
-]]></value>
+]]>
+                    </value>
                 </model>
             </output>
         </method>
@@ -145,17 +151,18 @@ For details on an Oracle Docker image, see https://github.com/oracle/docker-imag
                         <value>io.helidon.dbclient.DbClient</value>
                     </list>
                     <list key="application-yaml-entries">
-                        <value file="../database/files/application-mongo.yaml.mustache" template="mustache"/>
+                        <value file="files/application-mongo.yaml.mustache" template="mustache"/>
                     </list>
                     <list key="application-test-yaml-entries">
-                        <value file="../database/files/application-test-mongo.yaml.mustache" template="mustache"/>
+                        <value file="files/application-test-mongo.yaml.mustache" template="mustache"/>
                     </list>
-                    <value key="start-db" template="mustache"><![CDATA[
+                    <value key="start-db"><![CDATA[
 Mongodb:
 ```
 docker run --rm --name mongo -p 27017:27017 mongo
 ```
-]]></value>
+]]>
+                    </value>
                 </model>
             </output>
         </method>
@@ -177,10 +184,10 @@ docker run --rm --name mongo -p 27017:27017 mongo
                         </map>
                     </list>
                     <list key="application-yaml-entries">
-                        <value file="../database/files/application-jdbc.yaml.mustache" template="mustache"/>
+                        <value file="files/application-jdbc.yaml.mustache" template="mustache"/>
                     </list>
                     <list key="application-test-yaml-entries">
-                        <value file="../database/files/application-test-jdbc.yaml.mustache" template="mustache"/>
+                        <value file="files/application-test-jdbc.yaml.mustache" template="mustache"/>
                     </list>
                 </model>
             </output>
@@ -223,7 +230,7 @@ docker run --rm --name mongo -p 27017:27017 mongo
     <call method="health" />
     <output>
         <templates engine="mustache" transformations="mustache,packaged">
-            <directory>../database/files</directory>
+            <directory>files</directory>
             <includes>
                 <include>src/main/**</include>
             </includes>
@@ -279,7 +286,8 @@ docker run --rm --name mongo -p 27017:27017 mongo
                 <value order="200"><![CDATA[
         DbClient dbClient = DbClient.create(config.get("db"));
         Contexts.globalContext().register(dbClient);
-]]></value>
+]]>
+                </value>
             </list>
             <list key="Main-routing-builder">
                 <value>.register("/db", new PokemonService())</value>
@@ -361,7 +369,8 @@ docker run --rm --name mongo -p 27017:27017 mongo
         response = client.get("/db/pokemon/7").request(String.class);
         assertThat(response.status(), is(Status.NOT_FOUND_404));
     }
-]]></value>
+]]>
+                </value>
                 <value order="50"><![CDATA[
     private static List<String> pokemonNames() {
         try (JsonReader reader = Json.createReader(PokemonService.class.getResourceAsStream("/pokemons.json"))) {
@@ -374,7 +383,8 @@ docker run --rm --name mongo -p 27017:27017 mongo
             return reader.readArray().stream().map(e -> e.asJsonObject().getString("name")).toList();
         }
     }
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>io.helidon.dbclient</value>
@@ -407,23 +417,17 @@ curl -i -X PUT -d '{"id":7,"name":"Raticate","idType":2}' http://localhost:8080/
 # Delete Pokémon with id 7
 curl -i -X DELETE http://localhost:8080/db/pokemon/7
 ```
-]]></value>
+]]>
+                </value>
             </list>
             <list key="readme-run-notes">
                 <value><![CDATA[
 This example requires a database, see [Database Setup](#database-setup).
-]]></value>
+]]>
+                </value>
             </list>
             <list key="readme-sections">
-                <value template="mustache"><![CDATA[
-### Database Setup
-
-In the `pom.xml` and `application.yaml` we provide configuration needed for {{server}} database.
-Start your database before running this example.
-
-Example docker commands to start databases in temporary containers:
-{{start-db}}
-]]></value>
+                <value template="mustache" file="files/README.md.mustache"/>
             </list>
             <list key="gitignore">
                 <value>ObjectStore/</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/.dockerignore b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/.dockerignore
new file mode 100644
index 00000000000..c8b241f2215
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/.dockerignore
@@ -0,0 +1 @@
+target/*
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.jlink.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.jlink.mustache
new file mode 100644
index 00000000000..4659123c983
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.jlink.mustache
@@ -0,0 +1,35 @@
+
+# 1st stage, build the app
+FROM container-registry.oracle.com/java/jdk-no-fee-term:21 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+
+# Do the Maven build to create the custom Java Runtime Image
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn package -Pjlink-image -DskipTests
+RUN echo "done!"
+
+# 2nd stage, build the final image with the JRI built in the 1st stage
+
+FROM debian:stretch-slim
+WORKDIR /helidon
+COPY --from=build /helidon/target/{{artifactId}}-jri ./
+ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.mustache
new file mode 100644
index 00000000000..11f2945897c
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.mustache
@@ -0,0 +1,43 @@
+
+# 1st stage, build the app
+FROM container-registry.oracle.com/java/jdk-no-fee-term:21 as build
+
+# Install maven
+WORKDIR /usr/share
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+{{#poms}}
+{{.}}
+{{/poms}}
+RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip {{#docker-phase1-options}}{{.}}{{^last}} {{/last}}{{/docker-phase1-options}}
+
+# Do the Maven build!
+# Incremental docker builds will resume here when you change sources
+{{#src-dirs}}
+{{.}}
+{{/src-dirs}}
+RUN mvn package -DskipTests
+
+RUN echo "done!"
+
+# 2nd stage, build the runtime image
+FROM container-registry.oracle.com/java/jdk-no-fee-term:21
+WORKDIR /helidon
+
+# Copy the binary built in the 1st stage
+COPY --from=build /helidon/{{#module-dir}}{{.}}/{{/module-dir}}target/{{artifactId}}.jar ./
+COPY --from=build /helidon/{{#module-dir}}{{.}}/{{/module-dir}}target/libs ./libs
+
+CMD ["java", "-jar", "{{artifactId}}.jar"]
+
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.native.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.native.mustache
new file mode 100644
index 00000000000..4ff85c6391e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/Dockerfile.native.mustache
@@ -0,0 +1,39 @@
+
+# 1st stage, build the app
+FROM ghcr.io/graalvm/graalvm-community:21.0.0-ol9 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
+
+# Do the Maven build!
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
+
+RUN echo "done!"
+
+# 2nd stage, build the runtime image
+FROM scratch
+WORKDIR /helidon
+
+# Copy the binary built in the 1st stage
+COPY --from=build /helidon/target/{{artifactId}} .
+
+ENTRYPOINT ["./{{artifactId}}"]
+
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.jlink.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.jlink.mustache
new file mode 100644
index 00000000000..9eeec989e18
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.jlink.mustache
@@ -0,0 +1,34 @@
+
+## Building a Custom Runtime Image
+
+Build the custom runtime image using the jlink image profile:
+
+```
+mvn package -Pjlink-image
+```
+
+This uses the helidon-maven-plugin to perform the custom image generation.
+After the build completes it will report some statistics about the build including the reduction in image size.
+
+The target/{{artifactId}}-jri directory is a self contained custom image of your application. It contains your application,
+its runtime dependencies and the JDK modules it depends on. You can start your application using the provide start script:
+
+```
+./target/{{artifactId}}-jri/bin/start
+```
+
+Class Data Sharing (CDS) Archive
+Also included in the custom image is a Class Data Sharing (CDS) archive that improves your application’s startup
+performance and in-memory footprint. You can learn more about Class Data Sharing in the JDK documentation.
+
+The CDS archive increases your image size to get these performance optimizations. It can be of significant size (tens of MB).
+The size of the CDS archive is reported at the end of the build output.
+
+If you’d rather have a smaller image size (with a slightly increased startup time) you can skip the creation of the CDS
+archive by executing your build like this:
+
+```
+mvn package -Pjlink-image -Djlink.image.addClassDataSharingArchive=false
+```
+
+For more information on available configuration options see the helidon-maven-plugin documentation.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.mustache
new file mode 100644
index 00000000000..254d62d913c
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.mustache
@@ -0,0 +1,19 @@
+
+## Building the Docker Image
+
+```
+docker build -t {{artifactId}} .
+```
+
+## Running the Docker Image
+
+{{#docker-run-readme-section}}
+{{.}}
+{{/docker-run-readme-section}}
+{{^docker-run-readme-section}}
+```
+docker run --rm -p 8080:8080 {{artifactId}}:latest
+```
+{{/docker-run-readme-section}}
+
+Exercise the application as described above.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.native-image.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.native-image.mustache
new file mode 100644
index 00000000000..15b9c34dd0f
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.md.native-image.mustache
@@ -0,0 +1,6 @@
+
+## Building a Native Image
+
+{{#native-sections}}
+{{.}}
+{{/native-sections}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.native.md b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.native.md
new file mode 100644
index 00000000000..13e443e87c5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/files/README.native.md
@@ -0,0 +1,12 @@
+The generation of native binaries requires an installation of GraalVM 22.1.0+.
+
+You can build a native binary using Maven as follows:
+
+```
+mvn -Pnative-image install -DskipTests
+```
+
+The generation of the executable binary may take a few minutes to complete depending on
+your hardware and operating system. When completed, the executable file will be available
+under the `target` directory and be named after the artifact ID you have chosen during the
+project generation phase.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/inputs.xml
new file mode 100644
index 00000000000..bbc058c29a3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/inputs.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="docker"
+                 name="Docker support"
+                 description="Add a Dockerfile to your project"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <exec src="/nodes/se/features/native-image/inputs.xml"/>
+                <exec src="/features/jlink/inputs.xml"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/output.xml
new file mode 100644
index 00000000000..b94452f153a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/docker/output.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${docker}">
+        <files>
+            <directory>files</directory>
+            <includes>
+                <include>.dockerignore</include>
+            </includes>
+        </files>
+        <templates engine="mustache" transformations="mustache">
+            <directory>files</directory>
+            <includes>
+                <include>Dockerfile.mustache</include>
+                <include if="${docker.native-image}">Dockerfile.native.mustache</include>
+                <include if="${docker.jlink-image}">Dockerfile.jlink.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <list key="poms" if="!${multi-module}">
+                <value>ADD pom.xml .</value>
+            </list>
+            <list key="src-dirs" if="!${multi-module}">
+                <value>ADD src src</value>
+            </list>
+            <list key="native-sections" if="${docker.native-image}">
+                <value file="files/README.native.md"/>
+            </list>
+            <list key="readme-sections">
+                <value order="50"
+                       template="mustache"
+                       file="files/README.md.mustache"/>
+                <value template="mustache"
+                       if="${docker.native-image}"
+                       file="files/README.md.native-image.mustache"/>
+                <value order="40" template="mustache" if="${docker.jlink-image}"
+                       file="files/README.md.jlink.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/fault-tolerance/files/src/main/java/__pkg__/FtService.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/FtService.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/fault-tolerance/files/src/main/java/__pkg__/FtService.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/extra.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/fault-tolerance/output.xml
similarity index 93%
rename from archetypes/archetypes/src/main/archetype/se/custom/extra.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/fault-tolerance/output.xml
index 2d70312d83d..eec94a9d218 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/extra.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/fault-tolerance/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,8 +20,15 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
 
-    <output>
+    <output if="${extra} contains 'fault-tolerance'">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/FtService.java.mustache</include>
+            </includes>
+        </templates>
         <model>
+            <value key="fault-tolerance">true</value>
             <list key="dependencies">
                 <map if="${extra} contains 'fault-tolerance'">
                     <value key="groupId">io.helidon.fault-tolerance</value>
@@ -185,7 +192,8 @@
             assertThat(clientResponse.as(String.class), is("timeout"));
         }
     }
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires" if="${extra} contains 'fault-tolerance'">
                 <value>io.helidon.faulttolerance</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/health/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/health/inputs.xml
new file mode 100644
index 00000000000..e8557d3fe34
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/health/inputs.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="health"
+                 name="Health Checks"
+                 description="Monitor your application’s health"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <boolean id="builtin"
+                         name="Built-in Health Checks"
+                         description="Report common health check statuses"
+                         default="true"
+                         optional="true"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/health/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/health/output.xml
new file mode 100644
index 00000000000..04c095de852
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/health/output.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="health">
+            <output>
+                <model>
+                    <value key="health" if="${health}">true</value>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <call method="health"/>
+    <output if="${health}">
+        <model if="${health.builtin}">
+            <value key="health.builtin">${health.builtin}</value>
+            <list key="dependencies" if="${flavor} == 'se'">
+                <map order="800">
+                    <value key="groupId">io.helidon.webserver.observe</value>
+                    <value key="artifactId">helidon-webserver-observe-health</value>
+                </map>
+                <map order="800">
+                    <value key="groupId">io.helidon.health</value>
+                    <value key="artifactId">helidon-health-checks</value>
+                </map>
+            </list>
+            <list key="MainTest-static-imports" if="${flavor} == 'se'">
+                <value>org.hamcrest.CoreMatchers.containsString</value>
+            </list>
+            <list key="Abstract-test" if="${flavor} == 'se'">
+                <value><![CDATA[
+    @Test
+    void testHealth() {
+        try (Http1ClientResponse response = client.get("/observe/health").request()) {
+            assertThat(response.status(), is(Status.OK_200));
+            assertThat(response.as(String.class), containsString("status\":\"UP"));
+        }
+    }
+]]>
+                </value>
+            </list>
+            <list key="readme-sections" if="${flavor} == 'se'">
+                <value><![CDATA[
+## Try health
+
+This example shows the basics of using Helidon SE Health. It uses the
+set of built-in health checks that Helidon provides plus defines a
+custom health check.
+
+Note the port number reported by the application.
+
+Probe the health endpoints:
+
+```bash
+curl -X GET http://localhost:8080/observe/health
+curl -X GET http://localhost:8080/observe/health/ready
+```
+
+]]>
+                </value>
+            </list>
+            <list key="module-requires" if="${flavor} == 'se'">
+                <value>io.helidon.webserver.observe.health</value>
+                <value>io.helidon.health.checks</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/files/src/main/java/module-info.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/files/src/main/java/module-info.java.mustache
new file mode 100644
index 00000000000..4e520db9fc8
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/files/src/main/java/module-info.java.mustache
@@ -0,0 +1,15 @@
+
+module {{package}} {
+{{#module-requires}}
+    requires {{.}};
+{{/module-requires}}
+
+    exports {{package}};
+
+{{#module-opens}}
+    opens {{.}};
+{{/module-opens}}
+{{#module-opens-package}}
+    opens {{package}};
+{{/module-opens-package}}
+}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/inputs.xml
new file mode 100644
index 00000000000..e872023244b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/inputs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="jpms"
+                 name="Module support (JPMS)"
+                 description="Add a module-info to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/output.xml
new file mode 100644
index 00000000000..6775591e5cc
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/jpms/output.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <output if="${jpms}">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/main/java/**/module-info.java.mustache</include>
+            </includes>
+        </templates>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/FileService.java.multipart.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/FileService.java.multipart.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/FileService.java.multipart.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.json.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.json.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.json.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.json.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.jsonp.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.jsonp.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.jsonp.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.jsonp.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/GreetService.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/GreetService.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Message.java.json.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/Message.java.json.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Message.java.json.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/java/__pkg__/Message.java.json.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/resources/WEB/index.html
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/index.html
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/files/src/main/resources/WEB/index.html
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/database-inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/inputs.xml
similarity index 51%
rename from archetypes/archetypes/src/main/archetype/se/custom/database-inputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/media/inputs.xml
index ece226d03df..9ea6bde896e 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/database-inputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/inputs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,22 +19,20 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <step name="Database" optional="true">
-        <inputs>
-            <boolean id="db"
-                     name="Database Support"
-                     description="Manage data in your application"
-                     default="false"
-                     optional="true">
+
+    <inputs>
+        <!-- TODO https://github.com/oracle/helidon-build-tools/issues/699 -->
+        <list id="media" name="Select Media Support" default="json" optional="true">
+            <option value="json" name="JSON" description="Handle 'application/json' payloads">
                 <inputs>
-                    <enum id="server" name="Select a Database Server" default="h2" optional="true">
-                        <option value="h2" name="H2" description="In-memory relational database" />
-                        <option value="mysql" name="MySQL" description="Relational database" />
-                        <option value="oracledb" name="Oracle DB" description="Multi-model database" />
-                        <option value="mongodb" name="MongoDB" description="NoSQL / Document database" />
+                    <enum id="json-lib" name="Select a JSON library" default="jsonp" optional="true">
+                        <option value="jsonp" name="JSON-P" description="Jakarta JSON Processing"/>
+                        <option value="jackson" name="Jackson" description="Popular JSON library"/>
+                        <option value="jsonb" name="JSON-B" description="Jakarta JSON Binding"/>
                     </enum>
                 </inputs>
-            </boolean>
-        </inputs>
-    </step>
+            </option>
+            <option value="multipart" name="MultiPart" description="Handle 'multipart/form-data' payloads"/>
+        </list>
+    </inputs>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/media/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/output.xml
new file mode 100644
index 00000000000..b9d8e5cf515
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/media/output.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!--suppress GrazieInspection -->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="jsonp">
+            <output if="${media.json-lib} contains 'jsonp'">
+                <model>
+                    <list key="MainTest-other-imports">
+                        <value>jakarta.json.JsonObject</value>
+                    </list>
+                    <list key="Abstract-tests">
+                        <value><![CDATA[
+    @Test
+    void testGreeting() {
+        ClientResponseTyped<JsonObject> response = client.get("/greet").request(JsonObject.class);
+        assertThat(response.status(), is(Status.OK_200));
+        assertThat(response.entity().getString("message"), is("Hello World!"));
+    }
+]]>
+                        </value>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="jackson">
+            <output if="${media.json-lib} contains 'jackson'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">com.fasterxml.jackson.core</value>
+                            <value key="artifactId">jackson-databind</value>
+                        </map>
+                        <map order="500">
+                            <value key="groupId">io.helidon.http.media</value>
+                            <value key="artifactId">helidon-http-media-jackson</value>
+                        </map>
+                    </list>
+                    <list key="module-requires">
+                        <value>com.fasterxml.jackson.annotation</value>
+                        <value>com.fasterxml.jackson.core</value>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="jsonb">
+            <output if="${media.json-lib} contains 'jsonb'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">io.helidon.http.media</value>
+                            <value key="artifactId">helidon-http-media-jsonb</value>
+                        </map>
+                    </list>
+                    <list key="Abstract-tests">
+                        <value><![CDATA[
+    @Test
+    void testGreet() {
+        ClientResponseTyped<Message> response = client.get("/greet").request(Message.class);
+        assertThat(response.status(), is(Status.OK_200));
+        assertThat(response.entity().getMessage(), is("Hello World!"));
+    }
+
+    @Test
+    void testGreetJoe() {
+        ClientResponseTyped<Message> response = client.get("/greet/Joe").request(Message.class);
+        assertThat(response.status(), is(Status.OK_200));
+        assertThat(response.entity().getMessage(), is("Hello Joe!"));
+    }
+]]>
+                        </value>
+                    </list>
+                    <list key="module-requires">
+                        <value>jakarta.json.bind</value>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="multipart">
+            <output if="${media} contains 'multipart'">
+                <model>
+                    <list key="dependencies">
+                        <map order="500">
+                            <value key="groupId">io.helidon.http.media</value>
+                            <value key="artifactId">helidon-http-media-multipart</value>
+                        </map>
+                        <map order="500">
+                            <value key="groupId">io.helidon.webserver</value>
+                            <value key="artifactId">helidon-webserver-static-content</value>
+                        </map>
+                    </list>
+                    <list key="module-requires">
+                        <value>io.helidon.http.media.multipart</value>
+                        <value>io.helidon.webserver.staticcontent</value>
+                    </list>
+                    <list key="module-opens">
+                        <value>WEB</value>
+                    </list>
+                    <list key="Main-helidon-imports">
+                        <value>io.helidon.http.Status</value>
+                        <value>io.helidon.http.HeaderNames</value>
+                        <value>io.helidon.http.HeaderValues</value>
+                        <value>io.helidon.webserver.staticcontent.StaticContentService</value>
+                    </list>
+                    <list key="Main-routing-builder">
+                        <value order="1"><![CDATA[.any("/", (req, res) -> {
+                    res.status(Status.MOVED_PERMANENTLY_301);
+                    res.header(HeaderValues.createCached(HeaderNames.LOCATION, "/ui"));
+                    res.send();
+                })
+                .register("/ui", StaticContentService.builder("WEB")
+                        .welcomeFileName("index.html")
+                        .build())
+                .register("/api", new FileService())]]>
+                        </value>
+                    </list>
+                    <list key="Abstract-tests">
+                        <value><![CDATA[
+    @Test
+    void testFileService() {
+        try (Http1ClientResponse response = client.get("/api").request()) {
+            assertThat(response.status(), is(Status.OK_200));
+        }
+    }
+]]>
+                        </value>
+                    </list>
+                </model>
+            </output>
+        </method>
+    </methods>
+
+    <call method="jsonp"/>
+    <call method="jackson"/>
+    <call method="jsonb"/>
+    <call method="multipart"/>
+
+    <output>
+        <templates engine="mustache" transformations="mustache,packaged" if="!(${media} contains 'json')">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/SimpleGreetResource.java.mustache</include>
+                <include>src/*/java/**/GreetService.java.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="jsonp-mustache,packaged" if="${media.json-lib} == 'jsonp'">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.java.jsonp.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="json-mustache,packaged" if="['jsonb', 'jackson'] contains ${media.json-lib}">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.json.mustache</include>
+            </includes>
+        </templates>
+        <templates engine="mustache" transformations="multipart-mustache,packaged" if="${media} contains 'multipart'">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/*.multipart.mustache</include>
+            </includes>
+        </templates>
+        <file source="files/src/main/resources/WEB/index.html" target="src/main/resources/WEB/index.html" if="${media} contains 'multipart'"/>
+        <model>
+            <value key="media-json" if="${media} contains 'json'">true</value>
+            <value key="media-json" if="!(${media} contains 'json')">false</value>
+            <value key="media-json-jackson" if="${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson'">true</value>
+            <value key="media-json-jackson" if="!(${media} contains 'json' &amp;&amp; ${media.json-lib} == 'jackson')">false</value>
+            <value key="json-lib" if="${media} contains 'json'">${media.json-lib}</value>
+            <value key="multipart" if="${media} contains 'multipart'">true</value>
+            <list key="readme-exercise-the-application">
+                <value order="900" if="${media} contains 'json'"><![CDATA[
+JSON:
+```
+curl -X GET http://localhost:8080/greet
+{"message":"Hello World!"}
+
+curl -X GET http://localhost:8080/greet/Joe
+{"message":"Hello Joe!"}
+
+curl -X PUT -H "Content-Type: application/json" -d '{"greeting" : "Hola"}' http://localhost:8080/greet/greeting
+
+curl -X GET http://localhost:8080/greet/Jose
+{"message":"Hola Jose!"}
+```
+]]>
+                </value>
+            </list>
+            <list key="dependencies" if="${media} contains 'multipart' || ${media.json-lib} == 'jsonp'">
+                <map order="500">
+                    <value key="groupId">jakarta.json</value>
+                    <value key="artifactId">jakarta.json-api</value>
+                </map>
+                <map order="500">
+                    <value key="groupId">io.helidon.http.media</value>
+                    <value key="artifactId">helidon-http-media-jsonp</value>
+                </map>
+            </list>
+            <list key="module-requires" if="${media} contains 'multipart' || ['jsonp', 'jsonb'] contains ${media.json-lib}">
+                <value>jakarta.json</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/inputs.xml
new file mode 100644
index 00000000000..c0711972343
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/inputs.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="metrics"
+                 name="Metrics"
+                 description="Collect application metrics"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <boolean id="builtin"
+                         name="Built-in Metrics"
+                         description="Expose common metrics"
+                         default="true"
+                         optional="true"/>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/output.xml
new file mode 100644
index 00000000000..66ff8933c68
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/metrics/output.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <methods>
+        <method name="metrics">
+            <output>
+                <model>
+                    <value key="metrics" if="${metrics}">true</value>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <call method="metrics"/>
+    <output if="${metrics}">
+        <model if="${metrics.builtin}">
+            <value key="metrics.builtin">${metrics.builtin}</value>
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.webserver.observe</value>
+                    <value key="artifactId">helidon-webserver-observe-metrics</value>
+                </map>
+                <map>
+                    <value key="groupId">io.helidon.metrics</value>
+                    <value key="artifactId">helidon-metrics-system-meters</value>
+                    <value key="scope">runtime</value>
+                </map>
+            </list>
+            <list key="Abstract-tests">
+                <value><![CDATA[
+    @Test
+    void testMetricsObserver() {
+        try (Http1ClientResponse response = client.get("/observe/metrics").request()) {
+            assertThat(response.status(), is(Status.OK_200));
+        }
+    }
+]]>
+                </value>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.webserver.observe.metrics</value>
+                <value>io.helidon.metrics.api</value>
+            </list>
+            <list key="readme-sections">
+                <value><![CDATA[
+## Try metrics
+
+```
+# Prometheus Format
+curl -s -X GET http://localhost:8080/observe/metrics
+# TYPE base:gc_g1_young_generation_count gauge
+. . .
+
+# JSON Format
+curl -H 'Accept: application/json' -X GET http://localhost:8080/observe/metrics
+{"base":...
+. . .
+```
+]]>
+                </value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/Dockerfile.native.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/Dockerfile.native.mustache
new file mode 100644
index 00000000000..4ff85c6391e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/Dockerfile.native.mustache
@@ -0,0 +1,39 @@
+
+# 1st stage, build the app
+FROM ghcr.io/graalvm/graalvm-community:21.0.0-ol9 as build
+
+WORKDIR /usr/share
+
+# Install maven
+RUN set -x && \
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz && \
+    tar -xvf apache-maven-*-bin.tar.gz  && \
+    rm apache-maven-*-bin.tar.gz && \
+    mv apache-maven-* maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/
+
+WORKDIR /helidon
+
+# Create a first layer to cache the "Maven World" in the local repository.
+# Incremental docker builds will always resume after that, unless you update
+# the pom
+ADD pom.xml .
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
+
+# Do the Maven build!
+# Incremental docker builds will resume here when you change sources
+ADD src src
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
+
+RUN echo "done!"
+
+# 2nd stage, build the runtime image
+FROM scratch
+WORKDIR /helidon
+
+# Copy the binary built in the 1st stage
+COPY --from=build /helidon/target/{{artifactId}} .
+
+ENTRYPOINT ["./{{artifactId}}"]
+
+EXPOSE 8080
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/README.md.native.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/README.md.native.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/README.md.native.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/README.md.native.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache
new file mode 100644
index 00000000000..6df51e051c3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/files/src/main/resources/META-INF/native-image/groupid/artifactid/native-image.properties.mustache
@@ -0,0 +1 @@
+Args=--initialize-at-build-time={{package}}{{#initialize-at-build-time}},{{.}}{{/initialize-at-build-time}}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/inputs.xml
new file mode 100644
index 00000000000..5b06cf7c311
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/inputs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <inputs>
+        <boolean id="native-image"
+                 name="GraalVM Native Image Support"
+                 description="Add a native-image capable Dockerfile to your project"
+                 default="false"
+                 optional="true"/>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/output.xml
new file mode 100644
index 00000000000..6cf48a826ed
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/native-image/output.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${docker}">
+        <templates engine="mustache" transformations="mustache,native-image" if="${docker.native-image}">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/resources/META-INF/**/*.mustache</include>
+            </includes>
+        </templates>
+        <model if="${docker.native-image}">
+            <list key="native-sections">
+                <value file="files/README.md.native.mustache"
+                       if="!(${db})"
+                       template="mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/observability.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/output.xml
similarity index 91%
rename from archetypes/archetypes/src/main/archetype/se/custom/observability.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/output.xml
index db722caf323..92f8ed323a3 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/observability.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <exec src="tracing-outputs.xml" if="${tracing}" />
     <output>
         <model if="${health} || ${metrics} || ${tracing}">
             <list key="module-requires">
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/application.jwt.yaml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/application.jwt.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/application.jwt.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/application.jwt.yaml
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/application.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/application.yaml.mustache
new file mode 100644
index 00000000000..e1d00b2f642
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/application.yaml.mustache
@@ -0,0 +1,14 @@
+
+{{#security}}
+
+security:
+  config.require-encryption: false
+  properties:
+{{#security-properties}}
+{{.}}
+{{/security-properties}}
+  providers:
+{{#providers-config-entries}}
+{{.}}
+{{/providers-config-entries}}
+{{/security}}
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/JwtOverrideService.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/JwtOverrideService.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/JwtOverrideService.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/JwtOverrideService.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Service1.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/Service1.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Service1.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/Service1.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Service2.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/Service2.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/Service2.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/java/__pkg__/Service2.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/google-login.html b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/WEB/google-login.html
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/google-login.html
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/WEB/google-login.html
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/static.js/google-app.js b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/WEB/static.js/google-app.js
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/WEB/static.js/google-app.js
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/WEB/static.js/google-app.js
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/backend-service-jwt.yaml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/backend-service-jwt.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/backend-service-jwt.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/backend-service-jwt.yaml
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/client-service-jwt.yaml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/client-service-jwt.yaml
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/client-service-jwt.yaml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/client-service-jwt.yaml
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/keystore.p12 b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/keystore.p12
new file mode 100644
index 00000000000..96df596265a
Binary files /dev/null and b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/keystore.p12 differ
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/signing-jwk.json b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/signing-jwk.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/signing-jwk.json
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/signing-jwk.json
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/verifying-jwk.json b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/verifying-jwk.json
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/resources/verifying-jwk.json
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/main/resources/verifying-jwk.json
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/test/java/__pkg__/OutboundOverrideJwtTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/test/java/__pkg__/OutboundOverrideJwtTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/test/java/__pkg__/OutboundOverrideJwtTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/test/java/__pkg__/OutboundOverrideJwtTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/test/java/__pkg__/SignatureMainTest.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/test/java/__pkg__/SignatureMainTest.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/test/java/__pkg__/SignatureMainTest.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/files/src/test/java/__pkg__/SignatureMainTest.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/inputs.xml
new file mode 100644
index 00000000000..3752a4047e5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/inputs.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="security"
+                 name="Secure Application"
+                 description="Authentication and authorization"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <list id="atn" name="Select Authentication Providers" optional="true">
+                    <option value="oidc" name="OIDC" description="OpenID Connect"/>
+                    <option value="jwt" name="JWT" description="JSON Web Token"/>
+                    <option value="google" name="Google Login" description="Google identity"/>
+                    <option value="http-signature" name="HTTP Signature" description="Service to service authentication"/>
+                </list>
+                <list id="atz" name="Select Authorization Providers" optional="true">
+                    <option value="abac" name="ABAC" description="Attribute Based Access Control"/>
+                </list>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/README.md b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/README.md
new file mode 100644
index 00000000000..11f8d94f10a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/README.md
@@ -0,0 +1,5 @@
+# Legacy folder
+
+This folder exist to keep backward compatibility with generated code from the archetype before 
+the layout refactoring. The plan is to remove and it and merge the content with the matching `output.xml` file
+once the test coverage is much better.
\ No newline at end of file
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/abac-output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/abac-output.xml
new file mode 100644
index 00000000000..ed29b599461
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/abac-output.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atz} contains 'abac'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-abac</value>
+                </map>
+            </list>
+            <list key="paths-config-entries">
+                <value order="90" if="!(${security.atn} contains 'oidc')"><![CDATA[         roles-allowed: ["user"]]]></value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/files/config.yaml.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/files/config.yaml.mustache
new file mode 100644
index 00000000000..ebbb7ffb4a2
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/files/config.yaml.mustache
@@ -0,0 +1,10 @@
+
+    security:
+      defaults:
+        authenticate: true
+      web-server:
+        # protected paths on the web server - do not include paths served by Jersey, as those are protected directly
+        paths:
+        {{#paths-config-entries}}
+        {{.}}
+        {{/paths-config-entries}}
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/google-output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/google-output.xml
new file mode 100644
index 00000000000..5cb5e9ee7a4
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/google-output.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atn} contains 'google'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-google-login</value>
+                </map>
+            </list>
+            <list key="paths-config-entries">
+                <value><![CDATA[    - path: "/rest/profile"
+      methods: ["get"]
+      authenticate: true]]>
+                </value>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.webserver.context</value>
+                <value>io.helidon.webserver.staticcontent</value>
+                <value>io.helidon.security.providers.google.login</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/http-signature-output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/http-signature-output.xml
new file mode 100644
index 00000000000..8f588095091
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/http-signature-output.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+
+        <model if="${security.atn} contains 'http-signature'">
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.security.providers</value>
+                    <value key="artifactId">helidon-security-providers-http-sign</value>
+                </map>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/jwt-output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/jwt-output.xml
new file mode 100644
index 00000000000..e0cb75641e3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/jwt-output.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model if="${security.atn} contains 'jwt'">
+            <list key="module-requires">
+                <value>io.helidon.webserver.context</value>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/legacy.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/legacy.xml
new file mode 100644
index 00000000000..57338ebd5f3
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/legacy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="jwt-output.xml"/>
+    <exec src="google-output.xml"/>
+    <exec src="http-signature-output.xml"/>
+    <exec src="abac-output.xml"/>
+    <exec src="output.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/output.xml
new file mode 100644
index 00000000000..9dee6e034e9
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/legacy/output.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${security}">
+        <model>
+            <value key="security">true</value>
+            <value key="features">true</value>
+            <list key="server-features">
+                <value template="mustache" file="files/config.yaml.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/security-outputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/output.xml
similarity index 95%
rename from archetypes/archetypes/src/main/archetype/se/custom/security-outputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/security/output.xml
index 5bd5b2e0e51..d1078b205c2 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/security-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/security/output.xml
@@ -50,13 +50,15 @@
         # as a role mapper. Using minimal configuration here
         client-id: "your-client-id"
         client-secret: "changeit"
-        identity-uri: "https://your-tenant-id.identity.oracle.com"]]></value>
+        identity-uri: "https://your-tenant-id.identity.oracle.com"]]>
+                        </value>
                     </list>
                     <list key="paths-config-entries">
                         <value><![CDATA[   - path: "/rest/profile"
              methods: ["get"]
              authenticate: true
-             roles-allowed: ["my_admins"]]]></value>
+             roles-allowed: ["my_admins"]]]>
+                        </value>
                     </list>
                     <list key="dependencies">
                         <map>
@@ -84,7 +86,8 @@
         Security security = Security.create(config.get("security"));
         // this is needed for proper encryption/decryption of cookies
         Contexts.globalContext().register(security);
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing">
                         <value><![CDATA[
@@ -92,7 +95,8 @@
             // IDCS requires a web resource for redirects
             routing.addFeature(OidcFeature.create(Config.global()));
         }
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing-builder">
                         <value><![CDATA[// web server does not (yet) have possibility to configure routes in config files, so explicit...
@@ -104,7 +108,8 @@
                                     .map(Subject::toString)
                                     .orElse("Security context is null"));
                         })
-                        .get("/loggedout", (req, res) -> res.send("You have been logged out"))]]></value>
+                        .get("/loggedout", (req, res) -> res.send("You have been logged out"))]]>
+                        </value>
                     </list>
                     <list key="module-requires">
                         <value>io.helidon.security</value>
@@ -134,7 +139,8 @@ Build and run the application and then try the endpoints:
 1. Open http://localhost:7987/rest/profile in your browser. This should present
  you with a response highlighting your logged in role (null) correctly as you are not logged in
 2. Open `http://localhost:7987/oidc/logout` in your browser. This will log you out from your IDCS and Helidon sessions
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -180,7 +186,8 @@ Build and run the application and then try the endpoints:
                 .addProvider(GoogleTokenProvider.builder()
                         .clientId("your-client-id.apps.googleusercontent.com"))
                 .build();
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-server-builder">
                         <value><![CDATA[.featuresDiscoverServices(false)
@@ -188,7 +195,8 @@ Build and run the application and then try the endpoints:
                 .addFeature(SecurityFeature.builder()
                                     .security(security)
                                     .build())
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing-builder">
                         <value><![CDATA[.get("/rest/profile", SecurityFeature.authenticate(),
@@ -202,15 +210,18 @@ Build and run the application and then try the endpoints:
                         res.next();
                     })
             .register(StaticContentService.create("/WEB"))
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-logging">
                         <value><![CDATA[
-            System.out.println("Check Google login http://localhost:" + server.port() + "/google-login.html");]]></value>
+            System.out.println("Check Google login http://localhost:" + server.port() + "/google-login.html");]]>
+                        </value>
                     </list>
                     <list key="security-properties">
                         <value><![CDATA[    google-client-id: "your-app-id.apps.googleusercontent.com"
-    proxy-host: ""]]></value>
+    proxy-host: ""]]>
+                        </value>
                     </list>
                     <list key="providers-config-entries">
                         <value><![CDATA[    - google-login:
@@ -232,10 +243,11 @@ Build and run the application and then try the endpoints:
         #  prefix: "bearer "
         # optional alternative - looking for first matching group
         #  regexp: "bearer (.*)"
-        #}]]></value>
+        #}]]>
+                        </value>
                     </list>
                     <list key="readme-sections" >
-                        <value template="mustache"><![CDATA[
+                        <value><![CDATA[
 ## Try Google login
 
 There is a static web page in src/main/resources/WEB with a page to login to Google.
@@ -245,7 +257,8 @@ Update the following files with your client id (it should support http://localho
 1. src/main/resources/application.yaml - set security.properties.google-client-id or override it in a file in ~/helidon/examples.yaml
 2. src/main/resources/WEB/index.html - update the meta tag in header with name "google-signin-client_id"
 3. src/main/java/io/helidon/security/examples/google/GoogleMain.java - update the client id in builder of provider
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -301,12 +314,14 @@ Update the following files with your client id (it should support http://localho
                         <value><![CDATA[
         Config clientConfig = Config.create(ConfigSources.classpath("client-service-jwt.yaml"));
         Config backendConfig = Config.create(ConfigSources.classpath("backend-service-jwt.yaml"));
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-after-server">
                         <value><![CDATA[
         server.context().register(server);
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-server-builder">
                         <value><![CDATA[// backend that prints the current user
@@ -328,12 +343,14 @@ Update the following files with your client id (it should support http://localho
 
                                     res.send(username);
                                 })))
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing-builder">
                         <value><![CDATA[.addFeature(SecurityHttpFeature.create(clientConfig.get("security.web-server")))
                 .register(new JwtOverrideService())
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing">
                         <value><![CDATA[        Config clientConfig = Config.create(ConfigSources.classpath("client-service-jwt.yaml"));]]></value>
@@ -344,7 +361,7 @@ Update the following files with your client id (it should support http://localho
                         <value>io.helidon.webclient.http1</value>
                     </list>
                     <list key="readme-sections">
-                        <value template="mustache"><![CDATA[
+                        <value><![CDATA[
 ## Try JWT
 
 ```bash
@@ -353,7 +370,8 @@ curl -u "jack:changeit" http://localhost:8080/override
 curl -u "jill:changeit" http://localhost:8080/propagate
 curl -u "jill:changeit" http://localhost:8080/override
 ```
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -367,6 +385,12 @@ curl -u "jill:changeit" http://localhost:8080/override
                         <include>src/*/java/**/Service2.java.mustache</include>
                     </includes>
                 </templates>
+                <files>
+                    <directory>files</directory>
+                    <includes>
+                        <include>src/main/resources/keystore.p12</include>
+                    </includes>
+                </files>
                 <model>
                     <list key="dependencies">
                         <map>
@@ -438,19 +462,22 @@ curl -u "jill:changeit" http://localhost:8080/override
             }
         });
     }
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing">
                         <value><![CDATA[
         SecurityHttpFeature security = SecurityHttpFeature.create(security1())
                 .securityDefaults(SecurityFeature.authenticate());
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-routing-builder">
                         <value><![CDATA[.addFeature(security)
                 .get("/service1*", SecurityFeature.rolesAllowed("user"))
                 .register(new Service1())
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="main-class-content">
                         <value><![CDATA[
@@ -553,11 +580,13 @@ private static void routing2(HttpRouting.Builder routing) {
     private static SecureUserStore users() {
         return login -> Optional.ofNullable(USERS.get(login));
     }
-]]></value>
+]]>
+                        </value>
                     </list>
                     <list key="Main-server-builder">
                         <value><![CDATA[.putSocket("service2", socket -> socket
-                        .routing(Main::routing2))]]></value>
+                        .routing(Main::routing2))]]>
+                        </value>
                     </list>
                     <list key="Main-after-server">
                         <value><![CDATA[server.context().register(server);]]></value>
@@ -571,7 +600,7 @@ private static void routing2(HttpRouting.Builder routing) {
                         <value>io.helidon.security.providers.httpsign</value>
                     </list>
                     <list key="readme-sections">
-                        <value template="mustache"><![CDATA[
+                        <value><![CDATA[
 ## Try Signature
 
 ```bash
@@ -579,7 +608,8 @@ curl -u "jack:changeit" http://localhost:8080/service1
 curl -u "jill:changeit" http://localhost:8080/service1-rsa
 curl -v -u "john:changeit" http://localhost:8080/service1
 ```
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -602,7 +632,8 @@ curl -v -u "john:changeit" http://localhost:8080/service1
   - abac:
       fail-on-unvalidated: true
       fail-if-none-validated: true
-]]></value>
+]]>
+                        </value>
                     </list>
                 </model>
             </output>
@@ -625,7 +656,8 @@ curl -v -u "john:changeit" http://localhost:8080/service1
                 <value><![CDATA[
 security:
   enabled: false
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>io.helidon.security.integration.common</value>
@@ -633,20 +665,7 @@ security:
             </list>
             <list key="application-yaml-entries"
                   if="!(${security.atn} contains 'http-signature' || ${security.atn} contains 'jwt')">
-                <value template="mustache"><![CDATA[
-{{#security}}
-
-security:
-  config.require-encryption: false
-  properties:
-{{#security-properties}}
-{{.}}
-{{/security-properties}}
-  providers:
-{{#providers-config-entries}}
-{{.}}
-{{/providers-config-entries}}
-{{/security}}]]></value>
+                <value template="mustache" file="files/application.yaml.mustache"/>
             </list>
         </model>
     </output>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.jaeger.md b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.jaeger.md
new file mode 100644
index 00000000000..f418b4b3743
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.jaeger.md
@@ -0,0 +1,28 @@
+## Tracing
+
+### Set up Jaeger
+
+First, you need to run the Jaeger tracer. Helidon will communicate with this tracer at runtime.
+
+Run Jaeger within a docker container:
+```
+docker run -d --name jaeger\
+   -e COLLECTOR_ZIPKIN_HOST_PORT=:9411\
+   -e COLLECTOR_OTLP_ENABLED=true\
+   -p 6831:6831/udp\
+   -p 6832:6832/udp\
+   -p 5778:5778\
+   -p 16686:16686\
+   -p 4317:4317\   
+   -p 4318:4318\
+   -p 14250:14250\
+   -p 14268:14268\
+   -p 14269:14269\
+   -p 9411:9411\
+   jaegertracing/all-in-one:1.43
+```
+
+### View Tracing Using Jaeger UI
+
+Jaeger provides a web-based UI at http://localhost:16686, where you can see a visual representation of
+the same data and the relationship between spans within a trace.
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.zipkin.md b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.zipkin.md
new file mode 100644
index 00000000000..d1ae33b0aea
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/README.zipkin.md
@@ -0,0 +1,47 @@
+## Tracing
+
+### Set up Zipkin
+
+First, you need to run the Zipkin tracer. Helidon will communicate with this tracer at runtime.
+
+Run Zipkin within a docker container, then check the Zipkin server health:
+```
+docker run -d --name zipkin -p 9411:9411 openzipkin/zipkin
+```
+Run the Zipkin docker image named openzipkin/zipkin.
+Check the Zipkin server health:
+```
+curl http://localhost:9411/health
+```
+Invoke the Zipkin REST API to check the Zipkin server health.
+```
+Response body
+{
+  "status": "UP",
+  "zipkin": {
+    "status": "UP",
+    "details": {
+      "InMemoryStorage{}": {
+        "status": "UP"
+      }
+    }
+  }
+}
+```
+All status fields should be UP.
+
+### View Tracing Using Zipkin REST API
+
+Run the curl command and check the response:
+```
+curl http://localhost:9411/api/v2/services
+```
+Response body
+```
+["helidon-mp-1"]
+```
+
+### View Tracing Using Zipkin UI
+
+Zipkin provides a web-based UI at http://localhost:9411/zipkin, where you can see a visual representation of 
+the same data and the relationship between spans within a trace.
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/TracedService.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/src/main/java/__pkg__/TracedService.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/TracedService.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/files/src/main/java/__pkg__/TracedService.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/inputs.xml
new file mode 100644
index 00000000000..6bbea87670a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/inputs.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <inputs>
+        <boolean id="tracing"
+                 name="Tracing"
+                 description="Distributed tracing system"
+                 default="false"
+                 optional="true">
+            <inputs>
+                <enum id="provider"
+                      name="Select a Tracing Provider"
+                      default="jaeger"
+                      optional="true">
+                    <option value="jaeger"
+                            name="Jaeger"
+                            description="Send traces to a Jaeger backend"/>
+                    <option value="zipkin"
+                            name="Zipkin"
+                            description="Send traces to a Zipkin backend"/>
+                </enum>
+            </inputs>
+        </boolean>
+    </inputs>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/legacy/legacy.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/legacy/legacy.xml
new file mode 100644
index 00000000000..af7adda1efe
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/legacy/legacy.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <methods>
+        <method name="tracing-jaeger">
+            <output if="${tracing.provider} == 'jaeger'">
+                <model>
+                    <list key="readme-sections">
+                        <value file="../files/README.jaeger.md"/>
+                    </list>
+                </model>
+            </output>
+        </method>
+        <method name="tracing-zipkin">
+            <output if="${tracing.provider} == 'zipkin'">
+                <model>
+                    <list key="readme-sections">
+                        <value file="../files/README.zipkin.md"/>
+                    </list>
+                </model>
+            </output>
+        </method>
+    </methods>
+    <call method="tracing-jaeger"/>
+    <call method="tracing-zipkin"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/tracing-outputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/output.xml
similarity index 92%
rename from archetypes/archetypes/src/main/archetype/se/custom/tracing-outputs.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/output.xml
index 34e3d8f154a..e239c635a22 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/tracing-outputs.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/tracing/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -27,11 +27,14 @@
             </includes>
         </templates>
         <model>
+            <value key="tracing">true</value>
+            <value key="tracing.provider">${tracing.provider}</value>
             <list key="application-yaml-entries">
                 <value><![CDATA[
 tracing:
   service: helidon-tracing-service
-]]></value>
+]]>
+                </value>
             </list>
             <list key="config-properties" if="${tracing.provider} == 'jaeger'">
                 <value>tracing.global=false</value>
@@ -63,7 +66,8 @@ Tracing:
 ```
 curl -X GET http://localhost:8080/traced
 ```
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>io.helidon.webserver.http2</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/files/README.md.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/files/README.md.mustache
new file mode 100644
index 00000000000..0183efed084
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/files/README.md.mustache
@@ -0,0 +1,21 @@
+
+## Exercise Webclient
+
+First, start the server:
+
+```
+java -jar target/{{artifactId}}.jar
+```
+
+Note the port number that it displays. For example:
+
+```
+WEB server is up! http://localhost:8080/simple-greet
+```
+
+Then run the client, passing the port number. It will connect
+to the server:
+
+```
+java -cp "target/classes:target/libs/*" {{package}}.WebClientMain PORT
+```
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/WebClientMain.java.mustache b/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/files/src/main/java/__pkg__/WebClientMain.java.mustache
similarity index 100%
rename from archetypes/archetypes/src/main/archetype/se/custom/files/src/main/java/__pkg__/WebClientMain.java.mustache
rename to archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/files/src/main/java/__pkg__/WebClientMain.java.mustache
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/output.xml
new file mode 100644
index 00000000000..45087fed95c
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/features/webclient/output.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <output if="${extra} contains 'webclient'">
+        <templates engine="mustache" transformations="mustache,packaged">
+            <directory>files</directory>
+            <includes>
+                <include>src/*/java/**/WebClientMain.java.mustache</include>
+            </includes>
+        </templates>
+        <model>
+            <value key="webclient">true</value>
+            <list key="dependencies">
+                <map>
+                    <value key="groupId">io.helidon.webclient</value>
+                    <value key="artifactId">helidon-webclient</value>
+                </map>
+            </list>
+            <list key="module-requires">
+                <value>io.helidon.webclient</value>
+            </list>
+            <list key="Abstract-tests">
+                <value><![CDATA[
+    @Test
+    public void testPerformGetMethod() {
+        String greeting = WebClientMain.performGetMethod(client);
+        assertThat(greeting, containsString("Hello World!"));
+    }
+]]>
+                </value>
+            </list>
+            <list key="MainTest-static-imports">
+                <value>org.hamcrest.CoreMatchers.containsString</value>
+            </list>
+            <list key="readme-sections">
+                <value template="mustache" file="files/README.md.mustache"/>
+            </list>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/se.xml b/archetypes/archetypes/src/main/archetype/nodes/se/inputs.xml
similarity index 81%
rename from archetypes/archetypes/src/main/archetype/se/se.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/inputs.xml
index 10837bdf0f7..5dbbd68c47c 100644
--- a/archetypes/archetypes/src/main/archetype/se/se.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/inputs.xml
@@ -29,25 +29,20 @@
                   optional="true">
                 <option value="quickstart"
                         name="Quickstart"
-                        description="Sample Helidon Nima project that includes multiple REST operations">
-                    <exec src="quickstart/quickstart-se.xml"/>
+                        description="Sample Helidon project that includes multiple REST operations">
+                    <exec src="/nodes/se/nodes/quickstart/inputs.xml"/>
                 </option>
                 <option value="database"
                         name="Database"
                         description="Helidon SE application that uses a database with the DB Client API">
-                    <exec src="database/database-se.xml"/>
+                    <exec src="/nodes/se/nodes/database/inputs.xml"/>
                 </option>
                 <option value="custom"
                         name="Custom"
                         description="Custom Helidon SE project">
-                    <exec src="custom/custom-se.xml"/>
+                    <exec src="/nodes/se/nodes/custom/inputs.xml"/>
                 </option>
             </enum>
         </inputs>
     </step>
-    <output>
-        <model>
-            <value key="app-type">${app-type}</value>
-        </model>
-    </output>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/mp/custom/observability.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/inputs.xml
similarity index 84%
rename from archetypes/archetypes/src/main/archetype/mp/custom/observability.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/inputs.xml
index ad0cb9d1ee4..3ed83ff1d87 100644
--- a/archetypes/archetypes/src/main/archetype/mp/custom/observability.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/inputs.xml
@@ -19,7 +19,5 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <exec src="tracing-outputs.xml" if="${tracing}"/>
-    <exec src="metrics-microprofile.xml" if="${metrics}"/>
-    <exec src="metrics-micrometer.xml" if="${metrics}"/>
+    <exec src="/nodes/se/steps/steps.xml"/>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/custom/custom-se.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/output.xml
similarity index 62%
rename from archetypes/archetypes/src/main/archetype/se/custom/custom-se.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/output.xml
index 988a0cc38c2..348c537b586 100644
--- a/archetypes/archetypes/src/main/archetype/se/custom/custom-se.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/custom/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,27 +19,28 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <exec src="/se/common/common-se.xml"/>
-    <exec src="/common/media.xml"/>
-    <source src="/common/media-sources.xml"/>
-    <exec src="/common/security.xml"/>
-    <source src="database-inputs.xml"/>
-    <source src="/common/extra.xml"/>
-    <source src="extra.xml"/>
-    <source src="/common/observability.xml"/>
-    <source src="observability.xml"/>
-    <exec src="/common/packaging.xml"/>
-    <exec src="database-output.xml" if="${db}"/>
-    <source src="security-outputs.xml" if="${security}"/>
-
+    <exec src="/nodes/se/features/common/output.xml"/>
+    <exec src="/nodes/se/features/media/output.xml"/>
+    <exec src="/nodes/se/features/security/legacy/legacy.xml"/>
+    <exec src="/nodes/se/features/webclient/output.xml"/>
+    <source src="/nodes/se/features/cors/output.xml"/>
+    <exec src="/nodes/se/features/fault-tolerance/output.xml"/>
+    <exec src="/nodes/se/features/metrics/output.xml"/>
+    <exec src="/nodes/se/features/health/output.xml"/>
+    <exec src="/nodes/se/features/tracing/legacy/legacy.xml" if="${tracing}"/>
+    <exec src="/nodes/se/features/tracing/output.xml" if="${tracing}"/>
+    <exec src="/nodes/se/features/output.xml"/>
+    <exec src="/nodes/se/features/docker/output.xml"/>
+    <exec src="/features/kubernetes/output.xml"/>
+    <exec src="/features/verrazzano/output.xml"/>
+    <exec src="/nodes/se/features/jpms/output.xml"/>
+    <exec src="/nodes/se/features/database/output.xml" if="${db}"/>
+    <exec src="/nodes/se/features/security/output.xml" if="${security}"/>
+    <exec src="/nodes/se/features/native-image/output.xml"/>
+    <exec src="/features/maven/output.xml"/>
+    <exec src="/features/customize-project/output.xml"/>
     <output>
-        <file source="files/src/main/resources/WEB/index.html" target="src/main/resources/WEB/index.html" if="${media} contains 'multipart'"/>
         <model>
-            <list key="native-sections" if="${docker}">
-                <value file="files/README.md.native.mustache"
-                       if="${docker.native-image} &amp;&amp; !(${db})"
-                       template="mustache"/>
-            </list>
             <list key="Main-routing-builder">
                 <value><![CDATA[.get("/simple-greet", (req, res) -> res.send("Hello World!"))]]></value>
             </list>
@@ -51,7 +52,8 @@
         assertThat(response.status(), is(Status.OK_200));
         assertThat(response.entity(), is("Hello World!"));
     }
-]]></value>
+]]>
+                </value>
             </list>
             <list key="readme-exercise-the-application">
                 <value order="999"><![CDATA[
@@ -60,7 +62,8 @@ Basic:
 curl -X GET http://localhost:8080/simple-greet
 Hello World!
 ```
-]]></value>
+]]>
+                </value>
             </list>
             <list key="module-requires">
                 <value>io.helidon.logging.common</value>
diff --git a/archetypes/archetypes/src/main/archetype/common/presets.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/inputs.xml
similarity index 91%
rename from archetypes/archetypes/src/main/archetype/common/presets.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/inputs.xml
index af89c930a54..65a6e11d79e 100644
--- a/archetypes/archetypes/src/main/archetype/common/presets.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/inputs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022 Oracle and/or its affiliates.
+    Copyright (c) 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
     <presets>
         <list path="media">
             <value>json</value>
@@ -38,5 +37,7 @@
         <boolean path="k8s">true</boolean>
         <boolean path="v8o">false</boolean>
         <boolean path="jpms">false</boolean>
+        <boolean path="db">true</boolean>
     </presets>
+    <exec src="/nodes/se/nodes/custom/inputs.xml"/>
 </archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/database/database-se.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/output.xml
similarity index 87%
rename from archetypes/archetypes/src/main/archetype/se/database/database-se.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/output.xml
index 9b2c2f300cc..3f087f6e679 100644
--- a/archetypes/archetypes/src/main/archetype/se/database/database-se.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/database/output.xml
@@ -19,12 +19,7 @@
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-
-    <exec src="/common/presets.xml"/>
-    <presets>
-        <boolean path="db">true</boolean>
-    </presets>
-    <exec src="/se/custom/custom-se.xml"/>
+    <exec src="/nodes/se/nodes/custom/output.xml"/>
     <output>
         <model>
             <value key="readme-description">Helidon SE application that uses a database with JPA</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/inputs.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/inputs.xml
new file mode 100644
index 00000000000..5dc3390fd60
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/inputs.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2023 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <presets>
+        <list path="media">
+            <value>json</value>
+        </list>
+        <boolean path="metrics">true</boolean>
+        <enum path="metrics.provider">microprofile</enum>
+        <boolean path="metrics.builtin">true</boolean>
+        <boolean path="health">true</boolean>
+        <boolean path="health.builtin">true</boolean>
+        <boolean path="tracing">false</boolean>
+        <list path="extra"/>
+        <boolean path="security">false</boolean>
+        <boolean path="docker">true</boolean>
+        <boolean path="docker.native-image">true</boolean>
+        <boolean path="docker.jlink-image">true</boolean>
+        <boolean path="k8s">true</boolean>
+        <boolean path="v8o">false</boolean>
+        <boolean path="jpms">false</boolean>
+        <boolean path="db">false</boolean>
+    </presets>
+    <exec src="/nodes/se/nodes/custom/inputs.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/se/quickstart/quickstart-se.xml b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/output.xml
similarity index 70%
rename from archetypes/archetypes/src/main/archetype/se/quickstart/quickstart-se.xml
rename to archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/output.xml
index d5d6d708822..b004c02471a 100644
--- a/archetypes/archetypes/src/main/archetype/se/quickstart/quickstart-se.xml
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/nodes/quickstart/output.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,13 +17,9 @@
 
 -->
 <archetype-script xmlns="https://helidon.io/archetype/2.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
-    <exec src="/common/presets.xml"/>
-    <presets>
-        <boolean path="db">false</boolean>
-    </presets>
-    <exec src="/se/custom/custom-se.xml"/>
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <exec src="/nodes/se/nodes/custom/output.xml"/>
     <output>
         <model>
             <value key="readme-description">Sample Helidon SE project that includes multiple REST operations.</value>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/output.xml b/archetypes/archetypes/src/main/archetype/nodes/se/output.xml
new file mode 100644
index 00000000000..a24846b406b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/output.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="/nodes/se/nodes/custom/output.xml"     if="${app-type} == 'custom'"/>
+    <exec src="/nodes/se/nodes/database/output.xml"   if="${app-type} == 'database'"/>
+    <exec src="/nodes/se/nodes/quickstart/output.xml" if="${app-type} == 'quickstart'"/>
+
+    <output>
+        <model>
+            <value key="app-type">${app-type}</value>
+        </model>
+    </output>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/customize-project.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/customize-project.xml
new file mode 100644
index 00000000000..a899e4ec96a
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/customize-project.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Customize Project" optional="true">
+        <exec src="/features/customize-project/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/database.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/database.xml
new file mode 100644
index 00000000000..be8376ad599
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/database.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Database" optional="true">
+        <exec src="/nodes/se/features/database/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/extra.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/extra.xml
new file mode 100644
index 00000000000..98c012f92b1
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/extra.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Extra" optional="true">
+        <inputs>
+            <list id="extra" name="Select Additional Components" optional="true">
+                <option value="webclient" name="WebClient" description="HTTP client"/>
+                <option value="fault-tolerance" name="Fault Tolerance" description="System for building resilient applications"/>
+                <option value="cors" name="CORS" description="Cross-Origin Resource Sharing utilities"/>
+            </list>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/media.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/media.xml
new file mode 100644
index 00000000000..d292596432f
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/media.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Media Support" optional="true">
+        <exec src="/nodes/se/features/media/inputs.xml"/>
+        <variables>
+            <text path="media.json-lib" if="!(${media} contains 'json')"/>
+        </variables>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/observability.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/observability.xml
new file mode 100644
index 00000000000..74bd3b5e492
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/observability.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Observability" optional="true">
+        <inputs>
+            <exec src="/nodes/se/features/metrics/inputs.xml"/>
+            <exec src="/nodes/se/features/health/inputs.xml"/>
+            <exec src="/nodes/se/features/tracing/inputs.xml"/>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/packaging.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/packaging.xml
new file mode 100644
index 00000000000..2b6184ef34e
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/packaging.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Packaging and Deployment" optional="true">
+        <exec src="/nodes/se/features/docker/inputs.xml"/>
+        <inputs>
+            <exec src="/features/kubernetes/inputs.xml"/>
+            <exec src="/features/verrazzano/inputs.xml"/>
+            <exec src="/nodes/se/features/jpms/inputs.xml"/>
+        </inputs>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/security.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/security.xml
new file mode 100644
index 00000000000..fbda21a4ac5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <step name="Security" optional="true">
+        <exec src="/nodes/se/features/security/inputs.xml"/>
+    </step>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/nodes/se/steps/steps.xml b/archetypes/archetypes/src/main/archetype/nodes/se/steps/steps.xml
new file mode 100644
index 00000000000..c787837c8f5
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/nodes/se/steps/steps.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+
+    <exec src="/nodes/se/steps/media.xml"/>
+    <exec src="/nodes/se/steps/security.xml"/>
+    <exec src="/nodes/se/steps/database.xml"/>
+    <exec src="/nodes/se/steps/extra.xml"/>
+    <exec src="/nodes/se/steps/observability.xml"/>
+    <exec src="/nodes/se/steps/packaging.xml"/>
+    <exec src="/nodes/se/steps/customize-project.xml"/>
+</archetype-script>
diff --git a/archetypes/archetypes/src/main/archetype/output.xml b/archetypes/archetypes/src/main/archetype/output.xml
new file mode 100644
index 00000000000..531ca9fa87b
--- /dev/null
+++ b/archetypes/archetypes/src/main/archetype/output.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 Oracle and/or its affiliates.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<archetype-script xmlns="https://helidon.io/archetype/2.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="https://helidon.io/archetype/2.0 https://helidon.io/xsd/archetype-2.0.xsd">
+    <exec src="/nodes/mp/output.xml" if="${flavor} == 'mp'"/>
+    <exec src="/nodes/se/output.xml" if="${flavor} == 'se'"/>
+    <output>
+        <model>
+            <value key="helidon-version">${helidon-version}</value>
+            <value key="flavor">${flavor}</value>
+        </model>
+    </output>
+</archetype-script>