diff --git a/docker-compose.yml b/docker-compose.yml
index 00bfc1a74bcfbaa083aba7069f8d8d5142728efc..d0e3f279d67680787b3e8b2a5b363beb3826aaf3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
   cloudiator-service:
     depends_on:
       - "cloudiator-store"
-    image: omi-registry.e-technik.uni-ulm.de/mowgli/mowgli-colosseum:latest
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/mowgli-colosseum:${MOWGLI_VERSION}
     restart: always
     environment:
       - MYSQL_USER=${DATABASE_USER}
@@ -92,7 +92,7 @@ services:
   evaluation-orchestrator:
     depends_on:
       - "application-catalogue"
-    image: omi-registry.e-technik.uni-ulm.de/mowgli/evaluation-orchestrator:latest
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/evaluation-orchestrator:${MOWGLI_VERSION}
     restart: always
     environment:
       - COLOSSEUM_URI=cloudiator-service
@@ -107,7 +107,7 @@ services:
   application-catalogue:
     depends_on:
       - "cloudiator-service"
-    image: omi-registry.e-technik.uni-ulm.de/mowgli/dbms-catalogue:latest
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/dbms-catalogue:${MOWGLI_VERSION}
     restart: always
     environment:
       - COLOSSEUM_URI=cloudiator-service
@@ -117,7 +117,7 @@ services:
   workload-API:
     depends_on:
       - "evaluation-orchestrator"
-    image: omi-registry.e-technik.uni-ulm.de/mowgli/workload-api:latest
+    image: omi-registry.e-technik.uni-ulm.de/mowgli/workload-api:${MOWGLI_VERSION}
     restart: always
     environment:
       - INFLUXDB_URL=${PUBLIC_IP}:8086
diff --git a/env-template b/env-template
index ca19cbc7eba2b973ff8b01c3db24217befc82732..205dea7f6f28496709ba0f34f5ebb26d342194c6 100644
--- a/env-template
+++ b/env-template
@@ -1,12 +1,15 @@
 #mandatory
 
+## Mowgli version: master, 0.1 (performance and scalability scenarios as presented at ICPE 2019) 
+MOWGLI_VERSION=master
+
 ## publicly accessible IP of the host running the Mowgli framework
 PUBLIC_IP=1.2.3.4
 
 ## repository for DBMS installation scripts
-SCRIPT_DOWNLOAD_ENDPOINT=https://omi-gitlab.e-technik.uni-ulm.de/mowgli/dbms-catalogue-scripts/raw/master
+SCRIPT_DOWNLOAD_ENDPOINT=https://omi-gitlab.e-technik.uni-ulm.de/mowgli/dbms-catalogue-scripts/raw/$MOWGLI_VERSION
 
-## sources to be downloaded by cloudiator-service for deploying cloudiator toos on the created VMs
+## sources to be downloaded by cloudiator-service for deploying cloudiator tools on the created VMs
 CLOUDIATOR_JRE_DOWNLOAD=http://javadl.sun.com/webapps/download/AutoDL?BundleId=106240
 CLOUDIATOR_LANCE_DOWNLOAD=https://omi-gitlab.e-technik.uni-ulm.de/mowgli/dbms-catalogue-scripts/raw/master/lance/server-0.2.0-SNAPSHOT.jar