diff --git a/docker-compose.yml b/docker-compose.yml
index f943ae2..4da0a1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,44 +1,68 @@
 version: "3.7"
 services:
+  openhab:
+    image: openhab/openhab:milestone-debian
+    container_name: mon_openhab
+    ports:
+      - '8080:8080'
+    networks:
+      - 'monitoring'
+    env_file:
+      - 'openhab.env'
+    volumes:
+      - '/etc/localtime:/etc/localtime:ro'
+      - '/etc/timezone:/etc/timezone:ro'
+      - '/opt/openhab/conf:/openhab/conf'
+      - '/opt/openhab/userdata:/openhab/userdata'
+      - '/opt/openhab/addons:/openhab/addons'
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints:
+          - node.labels.openhab == true
+
   influxdb:
-      image: influxdb
-      container_name: graph_influxdb
-      ports:
-        - '8083:8083'
-        - '8086:8086'
-        - '8090:8090'
-      networks:
-        - 'monitoring'
-      env_file:
-        - 'influxdb.env'
-      volumes:
-        - '/docker/influxdb:/var/lib/influxdb'
-      deploy:
-        mode: replicated
-        replicas: 1
+    image: influxdb
+    container_name: mon_influxdb
+    ports:
+      - '8083:8083'
+      - '8086:8086'
+      - '8090:8090'
+    networks:
+      - 'monitoring'
+    env_file:
+      - 'influxdb.env'
+    volumes:
+      - '/docker/influxdb:/var/lib/influxdb'
+    deploy:
+      mode: replicated
+      replicas: 1
 
   grafana:
-      image: grafana/grafana:latest
-      container_name: graph_grafana
-      ports:
-        - "3001:3000"
-      networks:
-        - 'monitoring'
-      env_file:
-        - 'grafana.env'
-      user: "0"
-      volumes:
-        - '/docker/grafana:/var/lib/grafana'
-      deploy:
-        mode: replicated
-        replicas: 1
-        placement:
-          constraints:
-            - node.labels.grafana == true
+    image: grafana/grafana:latest
+    container_name: mon_grafana
+    ports:
+      - "3001:3000"
+    networks:
+      - 'monitoring'
+    env_file:
+      - 'grafana.env'
+    user: "0"
+    volumes:
+      - '/docker/grafana:/var/lib/grafana'
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints:
+          - node.labels.grafana == true
             
 networks:
   monitoring:
 volumes:
+  openhab-volume:
+    external: true
   grafana-volume:
     external: true
   influxdb-volume:
diff --git a/openhab.env b/openhab.env
new file mode 100644
index 0000000..1520e0d
--- /dev/null
+++ b/openhab.env
@@ -0,0 +1,3 @@
+USER_ID=999
+GROUP_ID=994
+CRYPTO_POLICY=unlimited
\ No newline at end of file