diff --git a/archetype/src/main/resources/archetype-resources/README.md b/archetype/src/main/resources/archetype-resources/README.md
index 30f578f..c584fe8 100644
--- a/archetype/src/main/resources/archetype-resources/README.md
+++ b/archetype/src/main/resources/archetype-resources/README.md
@@ -20,11 +20,11 @@ You can run the application by executing the following command from the director
 ```
 
 #if ((${runtime} == 'payara') && (${profile} != 'full'))
-Once the runtime starts, you can access the project at http://localhost:8080
+Once the runtime starts, you can access the project at [http://localhost:8080](http://localhost:8080).
 #elseif (${runtime} == 'open-liberty')
-Once the runtime starts, you can access the project at http://localhost:9080
+Once the runtime starts, you can access the project at [http://localhost:9080](http://localhost:9080).
 #else
-Once the runtime starts, you can access the project at http://localhost:8080/${artifactId}.
+Once the runtime starts, you can access the project at [http://localhost:8080/${artifactId}](http://localhost:8080/${artifactId}).
 #end
 
 #if ((${docker} == 'yes') and (${runtime} != 'glassfish'))
@@ -46,9 +46,9 @@ docker run -it --rm -p 9080:9080 ${artifactId}:v1
 ```
 
 #if (${runtime} != 'open-liberty')
-Once the runtime starts, you can access the project at http://localhost:8080/${artifactId}.
+Once the runtime starts, you can access the project at [http://localhost:8080/${artifactId}](http://localhost:8080/${artifactId}).
 #else
-Once the runtime starts, you can access the project at http://localhost:9080/
+Once the runtime starts, you can access the project at [http://localhost:9080/](http://localhost:9080/).
 #end
 #end
 #else
@@ -59,5 +59,5 @@ Once the runtime starts, you can access the project at http://localhost:9080/
   ```
  
   This will generate a file named `${artifactId}.war`. You should be able to run the application by deploying the file to
-  a [Jakarta EE compatible runtime](https://jakarta.ee/compatibility). 
-#end
\ No newline at end of file
+  a [Jakarta EE compatible runtime](https://jakarta.ee/compatibility).
+#end
diff --git a/archetype/src/main/resources/archetype-resources/src/main/webapp/index.html b/archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
index b40d6e9..807e0d8 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/archetype/src/main/resources/archetype-resources/src/main/webapp/index.html
@@ -20,13 +20,13 @@ <h2>Welcome!</h2>
     <p><b>Learn more!</b><br/>
        There are many excellent free resources to learn Jakarta EE! The following are some that you should begin exploring alongside the starter.
        <ul>
-           <li>The <a target="_blank" href="https://eclipse-ee4j.github.io/jakartaee-tutorial">Jakarta EE Tutorial</a> is a comprehensive reference
+           <li>The <a target="_blank" href="https://jakarta.ee/learn/docs/jakartaee-tutorial/current/">Jakarta EE Tutorial</a> is a comprehensive reference
            for developing applications with Jakarta EE.</li>
            <li>The <a target="_blank" href="https://eclipse-ee4j.github.io/jakartaee-firstcup/">First Cup</a> is part of the Tutorial and is a gentle
            hands-on introduction to Jakarta EE.</li>
            <li>You can further explore the <a target="_blank" href="https://github.com/eclipse-ee4j/jakartaee-firstcup-examples">First Cup Examples</a>
            to get a feel for how Jakarta EE applications look like.</li>
-           <li>The <a target="_blank" href="https://github.com/eclipse-ee4j/jakartaee-tutorial-examples">Jakarta EE Tutorial Examples</a> is a very
+           <li>The <a target="_blank" href="https://github.com/eclipse-ee4j/jakartaee-examples">Jakarta EE Examples</a> is a very
            comprehensive resource showing you how to use many Jakarta EE APIs and features.</li>
            <li>The <a target="_blank" href="https://eclipse-ee4j.github.io/cargotracker/">Eclipse Cargo Tracker</a> project demonstrates first-hand how you can
            develop applications with Jakarta EE using widely adopted architectural best practices like Domain-Driven Design (DDD).</li>
@@ -36,4 +36,4 @@ <h2>Welcome!</h2>
 		<b>We hope you enjoy your Jakarta EE journey!</b>
 	</p>
 </body>
-</html>
\ No newline at end of file
+</html>