diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 61c9ba49..a0bf56d5 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
@@ -44,10 +44,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/README.adoc b/README.adoc
index 2830b50c..57df2f4b 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, 2024 IBM Corporation and others.
+// Copyright (c) 2018, 2025 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
@@ -292,7 +292,7 @@ The following table breaks down some of the properties:
 | [hotspot=algorithm file=0]`mp.jwt.verify.publickey.algorithm` | With this property, you can control the Public Key Signature Algorithm that is supported by the MicroProfile JWT endpoint. The default value is RS256. Previously, this configuration was included in the `server.xml` file.
 |===
 
-For more information about these and other JWT properties, see the https://openliberty.io/docs/latest/microprofile-config-properties.html#jwt[MicroProfile Config properties for MicroProfile JSON Web Token documentation^].
+For more information about these and other JWT properties, see the https://openliberty.io/docs/latest/reference/microprofile-config-properties.html#jwt[MicroProfile Config properties for MicroProfile JSON Web Token documentation^].
 
 Next, add the MicroProfile JSON Web Token feature to the Liberty `server.xml` configuration file for the `system` service.
 
diff --git a/finish/frontend/pom.xml b/finish/frontend/pom.xml
index 7111debc..549c4bb6 100644
--- a/finish/frontend/pom.xml
+++ b/finish/frontend/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/finish/frontend/src/main/liberty/config/server.xml b/finish/frontend/src/main/liberty/config/server.xml
index e683c423..c6a7cc23 100755
--- a/finish/frontend/src/main/liberty/config/server.xml
+++ b/finish/frontend/src/main/liberty/config/server.xml
@@ -2,17 +2,19 @@
 <server description="Sample Liberty server">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>faces-4.0</feature>
-        <feature>cdi-4.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>faces</feature>
+        <feature>cdi</feature>
         <!-- FOR SECURITY -->
-        <feature>appSecurity-5.0</feature>
-        <feature>servlet-6.0</feature>
-        <feature>mpJwt-2.1</feature>
-        <feature>mpConfig-3.1</feature>
-        <feature>mpRestClient-3.0</feature>
+        <feature>appSecurity</feature>
+        <feature>servlet</feature>
+        <feature>mpJwt</feature>
+        <feature>mpConfig</feature>
+        <feature>mpRestClient</feature>
 
     </featureManager>
 
diff --git a/finish/system/pom.xml b/finish/system/pom.xml
index 4ec94037..dea1a729 100644
--- a/finish/system/pom.xml
+++ b/finish/system/pom.xml
@@ -35,7 +35,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
index b786faf9..1449cc07 100755
--- a/finish/system/src/main/liberty/config/server.xml
+++ b/finish/system/src/main/liberty/config/server.xml
@@ -1,16 +1,18 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>jsonp-2.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpRestClient-3.0</feature>
-    <feature>appSecurity-5.0</feature>
-    <feature>servlet-6.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>mpConfig</feature>
+    <feature>mpRestClient</feature>
+    <feature>appSecurity</feature>
+    <feature>servlet</feature>
     <!-- tag::mpJwt[] -->
-    <feature>mpJwt-2.1</feature>
+    <feature>mpJwt</feature>
     <!-- end::mpJwt[] -->
   </featureManager>
 
diff --git a/finish/system/src/main/webapp/favicon.ico b/finish/system/src/main/webapp/favicon.ico
new file mode 100644
index 00000000..c8652f35
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 501d757c..19060846 100755
--- a/finish/system/src/main/webapp/index.html
+++ b/finish/system/src/main/webapp/index.html
@@ -30,16 +30,16 @@ <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/#mpJwt-2.1.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token 2.1</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/#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/#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/#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/#servlet-6.0.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet 6.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.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/#mpJwt.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#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>
+            <li><a href="https://openliberty.io/docs/ref/feature/#servlet.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security)</a></li>
         </ul>
     </p>
 </div>
diff --git a/start/frontend/pom.xml b/start/frontend/pom.xml
index 747934b0..19f48370 100644
--- a/start/frontend/pom.xml
+++ b/start/frontend/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/start/frontend/src/main/liberty/config/server.xml b/start/frontend/src/main/liberty/config/server.xml
index e683c423..c6a7cc23 100755
--- a/start/frontend/src/main/liberty/config/server.xml
+++ b/start/frontend/src/main/liberty/config/server.xml
@@ -2,17 +2,19 @@
 <server description="Sample Liberty server">
 
     <featureManager>
-        <feature>restfulWS-3.1</feature>
-        <feature>jsonb-3.0</feature>
-        <feature>jsonp-2.1</feature>
-        <feature>faces-4.0</feature>
-        <feature>cdi-4.0</feature>
+        <platform>jakartaee-10.0</platform>
+        <platform>microprofile-7.0</platform>
+        <feature>restfulWS</feature>
+        <feature>jsonb</feature>
+        <feature>jsonp</feature>
+        <feature>faces</feature>
+        <feature>cdi</feature>
         <!-- FOR SECURITY -->
-        <feature>appSecurity-5.0</feature>
-        <feature>servlet-6.0</feature>
-        <feature>mpJwt-2.1</feature>
-        <feature>mpConfig-3.1</feature>
-        <feature>mpRestClient-3.0</feature>
+        <feature>appSecurity</feature>
+        <feature>servlet</feature>
+        <feature>mpJwt</feature>
+        <feature>mpConfig</feature>
+        <feature>mpRestClient</feature>
 
     </featureManager>
 
diff --git a/start/system/pom.xml b/start/system/pom.xml
index 4ec94037..dea1a729 100644
--- a/start/system/pom.xml
+++ b/start/system/pom.xml
@@ -35,7 +35,7 @@
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>6.1</version>
+            <version>7.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
diff --git a/start/system/src/main/liberty/config/server.xml b/start/system/src/main/liberty/config/server.xml
index 51a6166b..7c63b381 100644
--- a/start/system/src/main/liberty/config/server.xml
+++ b/start/system/src/main/liberty/config/server.xml
@@ -1,14 +1,16 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.1</feature>
-    <feature>jsonb-3.0</feature>
-    <feature>jsonp-2.1</feature>
-    <feature>cdi-4.0</feature>
-    <feature>mpConfig-3.1</feature>
-    <feature>mpRestClient-3.0</feature>
-    <feature>appSecurity-5.0</feature>
-    <feature>servlet-6.0</feature>
+    <platform>jakartaee-10.0</platform>
+    <platform>microprofile-7.0</platform>
+    <feature>restfulWS</feature>
+    <feature>jsonb</feature>
+    <feature>jsonp</feature>
+    <feature>cdi</feature>
+    <feature>mpConfig</feature>
+    <feature>mpRestClient</feature>
+    <feature>appSecurity</feature>
+    <feature>servlet</feature>
   </featureManager>
 
   <variable name="http.port" defaultValue="8080"/>
diff --git a/start/system/src/main/webapp/favicon.ico b/start/system/src/main/webapp/favicon.ico
new file mode 100644
index 00000000..c8652f35
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 501d757c..19060846 100755
--- a/start/system/src/main/webapp/index.html
+++ b/start/system/src/main/webapp/index.html
@@ -30,16 +30,16 @@ <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/#mpJwt-2.1.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token 2.1</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/#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/#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/#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/#servlet-6.0.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet 6.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.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/#mpJwt.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token</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/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</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/#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>
+            <li><a href="https://openliberty.io/docs/ref/feature/#servlet.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security)</a></li>
         </ul>
     </p>
 </div>