diff --git a/scaffolder-templates/agentic-ai-template/skeleton/.devfile.yaml b/scaffolder-templates/agentic-ai-template/skeleton/.devfile.yaml
index 34b3e9c..70332d9 100644
--- a/scaffolder-templates/agentic-ai-template/skeleton/.devfile.yaml
+++ b/scaffolder-templates/agentic-ai-template/skeleton/.devfile.yaml
@@ -4,7 +4,7 @@ metadata:
 components:
   - name: tools
     container:
-      image: quay.io/devfile/universal-developer-image:ubi8-8fca167
+      image: quay.io/devfile/universal-developer-image:ubi9-9b60f86
       env:
         - name: QUARKUS_HTTP_HOST
           value: 0.0.0.0
@@ -42,4 +42,4 @@ components:
       memoryRequest: 5Mi
       memoryLimit: 6G
       cpuRequest: 1000m
-      cpuLimit: 4000m
\ No newline at end of file
+      cpuLimit: 4000m
diff --git a/scaffolder-templates/agentic-ai-template/skeleton/.sdkmanrc b/scaffolder-templates/agentic-ai-template/skeleton/.sdkmanrc
index 109dc6f..7feabc2 100644
--- a/scaffolder-templates/agentic-ai-template/skeleton/.sdkmanrc
+++ b/scaffolder-templates/agentic-ai-template/skeleton/.sdkmanrc
@@ -1 +1 @@
-java=21.0.2-tem
+java=21.0.5-tem
diff --git a/scaffolder-templates/parasol-java-template/skeleton/.devfile.yaml b/scaffolder-templates/parasol-java-template/skeleton/.devfile.yaml
index ed90029..102a4c5 100644
--- a/scaffolder-templates/parasol-java-template/skeleton/.devfile.yaml
+++ b/scaffolder-templates/parasol-java-template/skeleton/.devfile.yaml
@@ -4,7 +4,7 @@ metadata:
 components:
   - name: tools
     container:
-      image: quay.io/devfile/universal-developer-image:ubi8-8fca167
+      image: quay.io/devfile/universal-developer-image:ubi9-9b60f86
       env:
         - name: QUARKUS_HTTP_HOST
           value: 0.0.0.0
@@ -42,4 +42,4 @@ components:
       memoryRequest: 5Mi
       memoryLimit: 6G
       cpuRequest: 1000m
-      cpuLimit: 4000m
\ No newline at end of file
+      cpuLimit: 4000m
diff --git a/scaffolder-templates/parasol-java-template/skeleton/.sdkmanrc b/scaffolder-templates/parasol-java-template/skeleton/.sdkmanrc
index 109dc6f..7feabc2 100644
--- a/scaffolder-templates/parasol-java-template/skeleton/.sdkmanrc
+++ b/scaffolder-templates/parasol-java-template/skeleton/.sdkmanrc
@@ -1 +1 @@
-java=21.0.2-tem
+java=21.0.5-tem
diff --git a/scaffolder-templates/parasol-java-template/skeleton/pom.xml b/scaffolder-templates/parasol-java-template/skeleton/pom.xml
index 47b1803..d2c1174 100644
--- a/scaffolder-templates/parasol-java-template/skeleton/pom.xml
+++ b/scaffolder-templates/parasol-java-template/skeleton/pom.xml
@@ -335,4 +335,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>