diff --git a/dockerfiles/elk/docker-compose.yml b/dockerfiles/elk/docker-compose.yml
index e8d5152..b458ce6 100644
--- a/dockerfiles/elk/docker-compose.yml
+++ b/dockerfiles/elk/docker-compose.yml
@@ -1,13 +1,13 @@
-version: '2'
+version: '2.2'
 services:
     elasticsearch:
-        image:
-            elasticsearch
+        image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
         container_name: elasticsearch
         hostname: elasticsearch
+        restart: unless-stopped
         ports:
-        - "9200:9200"
-        - "9300:9300"
+        - "10.1.0.10:9200:9200"
+        - "10.1.0.10:9300:9300"
         volumes:
         - elastic-data:/usr/share/elasticsearch/data
         environment:
@@ -25,8 +25,9 @@ services:
         image:
             kibana
         hostname: kibana
+        restart: unless-stopped
         ports:
-        - "5601:5601"
+        - "10.1.0.10:5601:5601"
         networks:
         - elk
         depends_on:
diff --git a/dockerfiles/logstash/logstash.conf b/dockerfiles/logstash/logstash.conf
new file mode 100644
index 0000000..d9f864c
--- /dev/null
+++ b/dockerfiles/logstash/logstash.conf
@@ -0,0 +1,22 @@
+input {
+  stdin { 
+    type => syslog
+        }
+      }
+
+filter {
+  if [type] == "syslog" {
+      grok {
+            match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} %{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}" }
+            add_field => [ "received_at", "%{@timestamp}" ]
+            add_field => [ "received_from", "%{host}" ]
+           }
+      date {
+            match => [ "syslog_timestamp", "MMM  d HH:mm:ss", "MMM dd HH:mm:ss" ]
+           }
+  }
+}
+
+output {
+  stdout { codec => rubydebug }
+}
diff --git a/dockerfiles/openhab/docker-compose.yml b/dockerfiles/openhab/docker-compose.yml
new file mode 100644
index 0000000..0672eb8
--- /dev/null
+++ b/dockerfiles/openhab/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2.2'
+
+services:
+  openhab:
+      image: "openhab/openhab:2.2.0-amd64-debian"
+      restart: always
+      network_mode: host
+      tty: true
+      volumes:
+        - "/etc/localtime:/etc/localtime:ro"
+        - "/etc/timezone:/etc/timezone:ro"
+        - "/opt/openhab/addons:/openhab/addons"
+        - "/opt/openhab/conf:/openhab/conf"
+        - "/opt/openhab/userdata:/openhab/userdata"
+      environment:
+        OPENHAB_HTTP_PORT: "8080"
+        OPENHAB_HTTPS_PORT: "8443"
+      expose:
+        - "8080"
+        - "8443"