diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7379358..91ca5fa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,9 +12,9 @@ jobs:
       canSkip: ${{ steps.Checker.outputs.canSkip }}
     steps:
       - name: Get files
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Get tools
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: tools/
           repository: openliberty/guides-common
@@ -46,10 +46,11 @@ jobs:
       run:
         working-directory: finish
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'semeru'
         java-version: 11
     - run: unset _JAVA_OPTIONS
     - name: Run tests
diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
index 9d048dc..b241523 100755
--- a/finish/inventory/src/main/liberty/config/server.xml
+++ b/finish/inventory/src/main/liberty/config/server.xml
@@ -1,12 +1,14 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>cdi-4.0</feature>
-    <feature>mpRestClient-3.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>jsonp-2.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>cdi</feature>
+    <feature>mpRestClient</feature>
+    <feature>mpConfig</feature>
+    <feature>jsonp</feature>
   </featureManager>
 
   <variable name="system.http.port" defaultValue="9080"/>
diff --git a/finish/inventory/src/main/webapp/favicon.ico b/finish/inventory/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/finish/inventory/src/main/webapp/favicon.ico differ
diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
index 18cb9cf..94fabd1 100755
--- a/finish/inventory/src/main/webapp/index.html
+++ b/finish/inventory/src/main/webapp/index.html
@@ -30,13 +30,13 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div> 
diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
index fd999a8..1143b85 100755
--- a/finish/system/src/main/liberty/config/server.xml
+++ b/finish/system/src/main/liberty/config/server.xml
@@ -1,10 +1,11 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonp-2.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>cdi</feature>
+    <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>
diff --git a/finish/system/src/main/webapp/favicon.ico b/finish/system/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/finish/system/src/main/webapp/favicon.ico differ
diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
index c775eea..96ea572 100755
--- a/finish/system/src/main/webapp/index.html
+++ b/finish/system/src/main/webapp/index.html
@@ -30,11 +30,11 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div> 
diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml
index 9d048dc..b241523 100755
--- a/start/inventory/src/main/liberty/config/server.xml
+++ b/start/inventory/src/main/liberty/config/server.xml
@@ -1,12 +1,14 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>cdi-4.0</feature>
-    <feature>mpRestClient-3.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>jsonp-2.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-6.1</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>cdi</feature>
+    <feature>mpRestClient</feature>
+    <feature>mpConfig</feature>
+    <feature>jsonp</feature>
   </featureManager>
 
   <variable name="system.http.port" defaultValue="9080"/>
diff --git a/start/inventory/src/main/webapp/favicon.ico b/start/inventory/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/start/inventory/src/main/webapp/favicon.ico differ
diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html
index 18cb9cf..94fabd1 100755
--- a/start/inventory/src/main/webapp/index.html
+++ b/start/inventory/src/main/webapp/index.html
@@ -30,13 +30,13 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div> 
diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
index fd999a8..1143b85 100755
--- a/start/system/src/main/liberty/config/server.xml
+++ b/start/system/src/main/liberty/config/server.xml
@@ -1,10 +1,11 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>cdi-4.0</feature>
-    <feature>jsonp-2.1</feature>
+    <platform>jakartaee-10.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>cdi</feature>
+    <feature>jsonp</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="9080"/>
diff --git a/start/system/src/main/webapp/favicon.ico b/start/system/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..c8652f3
Binary files /dev/null and b/start/system/src/main/webapp/favicon.ico differ
diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html
index c775eea..96ea572 100755
--- a/start/system/src/main/webapp/index.html
+++ b/start/system/src/main/webapp/index.html
@@ -30,11 +30,11 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
         </ul>
     </p>
 </div>