diff --git a/templates.json b/templates.json
index f17831a..f2aa1f0 100644
--- a/templates.json
+++ b/templates.json
@@ -234,13 +234,13 @@
     {
       "type": 1,
       "title": "Confluence Training Instance",
-      "description": "Installs Confluence 8.1 with OpenJDK",
+      "description": "Installs a Confluence Training Instance",
       "logo": "https://cdn.icon-icons.com/icons2/2429/PNG/512/confluence_logo_icon_147305.png",
       "platform": "linux",
-      "name": "confluence",
-      "hostname": "confluence",
+      "name": "confluence-training",
+      "hostname": "confluence-training",
       "categories": ["wiki", "atlassian", "confluence"],
-      "image": "docker.anarcon.org/academy/confluence_training:3.1",
+      "image": "confluence_training:1.0",
       "volumes": [
         {
           "container": "/var/atlassian/application-data/confluence"
@@ -315,13 +315,13 @@
     {
       "type": 1,
       "title": "Jira Training Instance",
-      "description": "Installs Jira 9",
+      "description": "Installs a Jira Training Instance",
       "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",
+      "name": "jira-training",
+      "hostname": "jira-training",
       "categories": ["project-management", "atlassian", "jira"],
-      "image": "docker.anarcon.org/academy/jira_training:3.53",
+      "image": "jira_training:1.0",
       "volumes": [
         {
           "container": "/var/atlassian/jira"