diff --git a/Dockerfile.production b/Dockerfile.production
index 83c6b0f..8859414 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -102,26 +102,26 @@
 USER appuser
 
 # Environment variables
-ENV OSMMON_MESSAGE_DRIVER kafka \
-    OSMMON_MESSAGE_HOST kafka \
-    OSMMON_MESSAGE_PORT 9092 \
-    OSMMON_DATABASE_DRIVER mongo \
-    OSMMON_DATABASE_URI mongodb://mongo:27017 \
-    OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db \
-    OSMMON_OPENSTACK_DEFAULT_GRANULARITY 300 \
-    OSMMON_GLOBAL_REQUEST_TIMEOUT 10 \
-    OSMMON_GLOBAL_LOGLEVEL INFO \
-    OSMMON_VCA_HOST localhost \
-    OSMMON_VCA_SECRET secret \
-    OSMMON_VCA_USER admin \
-    OSMMON_VCA_CACERT cacert \
-    OSMMON_DATABASE_COMMONKEY changeme \
-    OSMMON_COLLECTOR_INTERVAL 30 \
-    OSMMON_EVALUATOR_INTERVAL 30 \
-    OSMMON_PROMETHEUS_URL http://prometheus:9090 \
-    OSMMON_GRAFANA_URL http://grafana:3000 \
-    OSMMON_GRAFANA_USER admin \
-    OSMMON_GRAFANA_PASSWORD admin
+ENV OSMMON_MESSAGE_DRIVER=kafka \
+    OSMMON_MESSAGE_HOST=kafka \
+    OSMMON_MESSAGE_PORT=9092 \
+    OSMMON_DATABASE_DRIVER=mongo \
+    OSMMON_DATABASE_URI=mongodb://mongo:27017 \
+    OSMMON_SQL_DATABASE_URI=sqlite:///mon_sqlite.db \
+    OSMMON_OPENSTACK_DEFAULT_GRANULARITY=300 \
+    OSMMON_GLOBAL_REQUEST_TIMEOUT=10 \
+    OSMMON_GLOBAL_LOGLEVEL=INFO \
+    OSMMON_VCA_HOST=localhost \
+    OSMMON_VCA_SECRET=secret \
+    OSMMON_VCA_USER=admin \
+    OSMMON_VCA_CACERT=cacert \
+    OSMMON_DATABASE_COMMONKEY=changeme \
+    OSMMON_COLLECTOR_INTERVAL=30 \
+    OSMMON_EVALUATOR_INTERVAL=30 \
+    OSMMON_PROMETHEUS_URL=http://prometheus:9090 \
+    OSMMON_GRAFANA_URL=http://grafana:3000 \
+    OSMMON_GRAFANA_USER=admin \
+    OSMMON_GRAFANA_PASSWORD=admin
 
 EXPOSE 8000