diff --git a/templates/molgenis/0/docker-compose.yml b/templates/molgenis/0/docker-compose.yml
index b9fa82e..e82aefe 100644
--- a/templates/molgenis/0/docker-compose.yml
+++ b/templates/molgenis/0/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "admin.password={MOLGENIS_ADMIN_PASSWORD}"
+      - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
diff --git a/templates/molgenis/1/docker-compose.yml b/templates/molgenis/1/docker-compose.yml
index f583316..854776e 100644
--- a/templates/molgenis/1/docker-compose.yml
+++ b/templates/molgenis/1/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "admin.password={MOLGENIS_ADMIN_PASSWORD}"
+      - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
diff --git a/templates/molgenis/4/docker-compose.yml b/templates/molgenis/4/docker-compose.yml
index 2946d3c..521d1e6 100644
--- a/templates/molgenis/4/docker-compose.yml
+++ b/templates/molgenis/4/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "admin.password={MOLGENIS_ADMIN_PASSWORD}"
+      - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
diff --git a/templates/molgenis/5/docker-compose.yml b/templates/molgenis/5/docker-compose.yml
index 6435aca..3b48780 100644
--- a/templates/molgenis/5/docker-compose.yml
+++ b/templates/molgenis/5/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "admin.password={MOLGENIS_ADMIN_PASSWORD}"
+      - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
diff --git a/templates/molgenis/5/rancher-compose.yml b/templates/molgenis/5/rancher-compose.yml
index 76cf4f8..0fc307d 100644
--- a/templates/molgenis/5/rancher-compose.yml
+++ b/templates/molgenis/5/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   name: molgenis
-  version: v6.0,0
+  version: v6.0.0
   description: Molgenis
   minimum_rancher_version: v1.6.3
   questions:
diff --git a/templates/molgenis/6/docker-compose.yml b/templates/molgenis/6/docker-compose.yml
index 39a7267..e85d060 100644
--- a/templates/molgenis/6/docker-compose.yml
+++ b/templates/molgenis/6/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "db_driver=org.postgresql.Driver"
       - "db_user=${DB_USERNAME}"
       - "db_password=${DB_PASSWORD}"
-      - "admin.password={MOLGENIS_ADMIN_PASSWORD}"
+      - "admin.password=${MOLGENIS_ADMIN_PASSWORD}"
       - "elasticsearch.cluster.name=${ELASTIC_CLUSTER}"
       - "elasticsearch.transport.addresses=elasticsearch:9300"
     labels:
diff --git a/templates/molgenis/6/rancher-compose.yml b/templates/molgenis/6/rancher-compose.yml
index 76cf4f8..e61f931 100644
--- a/templates/molgenis/6/rancher-compose.yml
+++ b/templates/molgenis/6/rancher-compose.yml
@@ -1,6 +1,6 @@
 .catalog:
   name: molgenis
-  version: v6.0,0
+  version: v7.0.0
   description: Molgenis
   minimum_rancher_version: v1.6.3
   questions: