diff --git a/docker-compose.yml b/docker-compose.yml
index f5f9282..e691614 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3.4'
+
 networks:
   cnc:
     external: false
@@ -8,7 +10,7 @@ services:
     restart: always
     environment:
       - POSTGRES_USER=cnc-service
-      - POSTGRES_PASSWORD=cnc-service
+      - POSTGRES_PASSWORD=cnc-service-supersecret
       - POSTGRES_DB=cnc-service
     networks:
       - cnc
@@ -29,6 +31,20 @@ services:
     depends_on:
       - activemq
       - postgres
+    environment:
+      SENTRY_DSN: https://8774ab5831814316a6aa33d07f94281c@sentry.kmlabz.com/8
+      RELEASE_ID: compose
+      CNC_SERVICE_RELEASEMODE: dev
+      CNC_POSTGRES_HOSTNAME: postgres
+      CNC_POSTGRES_USERNAME: cnc-service
+      CNC_POSTGRES_PASSWORD: cnc-service-supersecret
+      CNC_POSTGRES_DB: cnc-service
+      CNC_MQTT_HOSTNAME: activemq
+      CNC_MQTT_PORT: "1883"
+      CNC_MQTT_USERNAME: artemis
+      CNC_MQTT_PASSWORD: artemis
+      CNC_MQTT_STATUS_TOPIC: status
+      CNC_MQTT_COMMAND_TOPIC: command
     networks:
       - cnc
     ports:
diff --git a/requirements.txt b/requirements.txt
index 343dc1b..0c16c99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,4 +8,5 @@ marshmallow
 marshmallow-sqlalchemy
 flask-marshmallow
 paho-mqtt
-flask-mqtt
\ No newline at end of file
+flask-mqtt
+psycopg2
diff --git a/src/config.py b/src/config.py
index 4f3e1b8..762c396 100644
--- a/src/config.py
+++ b/src/config.py
@@ -27,8 +27,8 @@ POSTGRES_DB = os.getenv("CNC_POSTGRES_DB", "cnc-service")
 
 MQTT_HOSTNAME = os.getenv("CNC_MQTT_HOSTNAME", "localhost")
 MQTT_PORT = os.getenv("CNC_MQTT_PORT", "1883")
-MQTT_USERNAME = os.getenv("CNC_MQTT_USERNAME", "guard-service")
-MQTT_PASSWORD = os.getenv("CNC_MQTT_PASSWORD", "guard-service")
-MQTT_STATUS_TOPIC = os.getenv("CNC_MQTT_STATUS_TOPIC", "guard-service")
-MQTT_COMMAND_TOPIC = os.getenv("CNC_MQTT_COMMAND_TOPIC", "guard-service")
+MQTT_USERNAME = os.getenv("CNC_MQTT_USERNAME", "cnc-service")
+MQTT_PASSWORD = os.getenv("CNC_MQTT_PASSWORD", "cnc-service")
+MQTT_STATUS_TOPIC = os.getenv("CNC_MQTT_STATUS_TOPIC", "cnc-service")
+MQTT_COMMAND_TOPIC = os.getenv("CNC_MQTT_COMMAND_TOPIC", "cnc-service")