diff --git a/templates.json b/templates.json
index 73ce2b4..27d4532 100644
--- a/templates.json
+++ b/templates.json
@@ -3,14 +3,14 @@
   "templates": [
     {
       "type": 1,
-      "title": "Confluence 8.1",
-      "description": "Installs Confluence 8.1 with OpenJDK",
+      "title": "Confluence Latest",
+      "description": "Installs Latest Confluence",
       "logo": "https://cdn.icon-icons.com/icons2/2429/PNG/512/confluence_logo_icon_147305.png",
       "platform": "linux",
       "name": "confluence",
       "hostname": "confluence",
       "categories": ["wiki", "atlassian", "confluence"],
-      "image": "atlassian/confluence:8.1",
+      "image": "atlassian/confluence-server:latest",
       "volumes": [
         {
           "container": "/var/atlassian/application-data/confluence"
@@ -118,14 +118,14 @@
     },
     {
       "type": 1,
-      "title": "Jira 9",
-      "description": "Installs Jira 9",
+      "title": "Jira Latest",
+      "description": "Installs Latest Jira",
       "logo": "https://wac-cdn.atlassian.com/dam/jcr:88902887-3bc9-48f4-b428-39ef6b0b280d/Jira%20Core-icon-blue.svg?cdnVersion=693",
       "platform": "linux",
       "name": "jira",
       "hostname": "jira",
       "categories": ["project-management", "atlassian", "jira"],
-      "image": "atlassian/jira-core:9.7",
+      "image": "atlassian/jira-software:latest",
       "volumes": [
         {
           "container": "/var/atlassian/jira"