diff --git a/swarm-templates/wordpress/0/rancher-compose.yml b/swarm-templates/wordpress/0/rancher-compose.yml
index 3ed1fba..fda81ae 100644
--- a/swarm-templates/wordpress/0/rancher-compose.yml
+++ b/swarm-templates/wordpress/0/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   name: "Wordpress"
-  version: latest-rancher1
+  version: 1.0.0-latest-rancher1
   description: "Blog tool, publishing platform and CMS"
   minimum_rancher_version: v1.0.0-rc2
   questions:
diff --git a/swarm-templates/wordpress/config.yml b/swarm-templates/wordpress/config.yml
index 97e474d..5a68a92 100644
--- a/swarm-templates/wordpress/config.yml
+++ b/swarm-templates/wordpress/config.yml
@@ -1,5 +1,5 @@
 name: Wordpress
 description: |
   Blog tool, publishing platform and CMS
-version: latest-rancher1
+version: 1.0.0-latest-rancher1
 category: Blogging
diff --git a/templates/alfresco/0/rancher-compose.yml b/templates/alfresco/0/rancher-compose.yml
index 15c8848..f32096c 100644
--- a/templates/alfresco/0/rancher-compose.yml
+++ b/templates/alfresco/0/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   name: "Alfresco"
-  version: "5.1 201605-GA"
+  version: "5.1.0-201605-GA"
   description: "Alfresco Electronic Document Management"
   uuid: alfresco-5.1-201605-1
   minimum_rancher_version: v0.56.0
diff --git a/templates/alfresco/config.yml b/templates/alfresco/config.yml
index 3d04415..a65eb4f 100644
--- a/templates/alfresco/config.yml
+++ b/templates/alfresco/config.yml
@@ -1,5 +1,5 @@
 name: Alfresco
 description: |
   An ECM and BPM platform.
-version: 5.1 201605-GA
+version: 5.1.0-201605-GA
 category: ECM