diff --git a/.env b/.env
deleted file mode 100644
index 8bfdddf..0000000
--- a/.env
+++ /dev/null
@@ -1,4 +0,0 @@
-ZMQ_CONNECTION_STRING=tcp://analytics:8002
-HASTIC_API_KEY=eyJrIjoiVDRUTUlKSjJ5N3dYTDdsd1JyWWRBNHFkb0VSeDBNTTYiLCJuIjoiaGFzdGljLXNlcnZlciIsImlkIjoxfQ==
-HASTIC_WEBHOOK_URL=http://localhost:8888
-HASTIC_WEBHOOK_TYPE=application/json
diff --git a/docker-compose.yml b/docker-compose.yml
index ead90db..99d6fcd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
-version: '2'
+version: '2.1'
 services:
   server:
     image: hastic/server:latest
-    build: 
+    build:
       dockerfile: server/Dockerfile
       context: .
     environment:
+      ZMQ_CONNECTION_STRING: ${ZMQ_CONNECTION_STRING:-tcp://analytics:8002}
       HASTIC_API_KEY: ${HASTIC_API_KEY}
-      ZMQ_CONNECTION_STRING: ${ZMQ_CONNECTION_STRING}
       HASTIC_WEBHOOK_URL: ${HASTIC_WEBHOOK_URL}
       HASTIC_WEBHOOK_TYPE: ${HASTIC_WEBHOOK_TYPE}
     ports: