diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 890e198b64..da7abb7472 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   # Primary Tower Development Container
   tower:
@@ -20,13 +20,17 @@ services:
       - postgres
       - memcached
       - rabbitmq
+      - logstash
     #   - sync
     # volumes_from:
     #   - sync
     volumes:
       - "../:/tower_devel"
     privileged: true
-
+  logstash:
+    build:
+      context: ./docker-compose
+      dockerfile: Dockerfile-logstash
   # Postgres Database Container
   postgres:
     image: postgres:9.4.1
@@ -38,16 +42,3 @@ services:
     image: rabbitmq:3-management
     ports:
       - "15672:15672"
-
-  # Source Code Synchronization Container
-  # sync:
-  #     build:
-  #         context: ./docker-compose
-  #         dockerfile: Dockerfile-sync
-  #     command: "lsyncd -delay 1 -nodaemon -rsync /src /tower_devel"
-  #     volumes:
-  #         - /tower_devel
-  #         - "../:/src"
-  #     working_dir: /src
-  #     stdin_open: true
-  #     tty: true
diff --git a/tools/docker-compose/Dockerfile-logstash b/tools/docker-compose/Dockerfile-logstash
new file mode 100644
index 0000000000..7117b90847
--- /dev/null
+++ b/tools/docker-compose/Dockerfile-logstash
@@ -0,0 +1,3 @@
+FROM logstash:5-alpine
+COPY logstash.conf /
+CMD ["-f", "/logstash.conf"]
diff --git a/tools/docker-compose/logstash.conf b/tools/docker-compose/logstash.conf
new file mode 100644
index 0000000000..9ab5145642
--- /dev/null
+++ b/tools/docker-compose/logstash.conf
@@ -0,0 +1,19 @@
+input {
+	http {
+		port => 8085
+		user => awx_logger
+		password => "workflows"
+	}
+}
+
+## Add your filters / logstash plugins configuration here
+
+filter {
+	json {
+		source => "message"
+	}
+}
+
+output {
+   stdout { codec => rubydebug }
+}
diff --git a/tools/elastic/logstash/Dockerfile b/tools/elastic/logstash/Dockerfile
index a340f51bbb..f3e87838a7 100644
--- a/tools/elastic/logstash/Dockerfile
+++ b/tools/elastic/logstash/Dockerfile
@@ -1,4 +1,4 @@
 FROM logstash:5
 
 # Add your logstash plugins setup here
-# Example: RUN logstash-plugin install logstash-filter-json 
\ No newline at end of file
+# Example: RUN logstash-plugin install logstash-filter-json