diff --git a/docker/Dockerfile.logstash b/docker/Dockerfile.logstash
new file mode 100644
index 0000000..a90ecb0
--- /dev/null
+++ b/docker/Dockerfile.logstash
@@ -0,0 +1,5 @@
+# Build from latest stable load
+FROM docker.elastic.co/logstash/logstash:5.6.0
+
+# Add logstash plugins 
+RUN logstash-plugin install logstash-output-opennms
diff --git a/docker/Dockerfile.opennms b/docker/Dockerfile.opennms
new file mode 100644
index 0000000..31233ef
--- /dev/null
+++ b/docker/Dockerfile.opennms
@@ -0,0 +1,17 @@
+# Build from latest stable load
+FROM opennms/horizon-core-web:19.0.1-1
+
+# Install supervisord
+RUN yum install -y python-setuptools
+RUN easy_install supervisor
+RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/opennms
+RUN mkdir -p /var/opennms/rrd
+RUN mkdir -p /var/opennms/reports
+COPY compose/opennms/env/supervisord.conf /etc/supervisor/supervisord.conf
+
+# Copy a new startup script to override the default entrypoint script
+COPY compose/opennms/env/opennms_start.sh /
+RUN chmod 755 /opennms_start.sh
+
+ENTRYPOINT ["/usr/bin/supervisord"]