diff --git a/docker-compose/logstash.yml b/docker-compose/logstash.yml
index 1a6430ff130d154d5b16cdce1ddea24803c55347..73a13e346433a3a337bf66383132d8c1e24e0352 100644
--- a/docker-compose/logstash.yml
+++ b/docker-compose/logstash.yml
@@ -1,8 +1,6 @@
 #
-# Docker compose file that launches LOgstash-output-loki
+# Docker compose file that launches Logstash-output-loki
 #
-# Defines:
-#   - prometheus: Prometheus
 #
 
 version: '2.1'
diff --git a/docker-compose/logstash/Dockerfile b/docker-compose/logstash/Dockerfile
index 1b547baec0925581872ebefe79e7506318afc242..7e0fff7a90ae61f57dcd9484838f125528c96f2f 100644
--- a/docker-compose/logstash/Dockerfile
+++ b/docker-compose/logstash/Dockerfile
@@ -2,4 +2,6 @@ ARG SOURCE_IMAGE
 FROM ${SOURCE_IMAGE}
 
 # Provide our logstash config
-ADD logstash /home/logstash/
+ADD logstash /etc/logstash/
+COPY loki.conf /home/logstash/
+COPY loki.conf /home/logstash/loki-test.conf
diff --git a/docker-compose/logstash/logstash/conf.d/30-output.conf b/docker-compose/logstash/logstash/conf.d/30-output.conf
index 1886b10217468a3cbdb07764897ca548d5cccbc2..9bad161d264c5c42268f9d94d40c1a39d5cae691 100644
--- a/docker-compose/logstash/logstash/conf.d/30-output.conf
+++ b/docker-compose/logstash/logstash/conf.d/30-output.conf
@@ -5,34 +5,6 @@ output {
   #   index => "logstash-%{+YYYY.MM.dd}"
   # }
   loki {
-    [url => "localhost:3100" | default = none | required=true]
-
-    [tenant_id => string | default = nil | required=false]
-
-    [message_field => string | default = "message" | required=false]
-    
-    [include_fields => array | default = [] | required=false]
-
-    [batch_wait => number | default = 1(s) | required=false]
-
-    [batch_size => number | default = 102400(bytes) | required=false]
-
-    [min_delay => number | default = 1(s) | required=false]
-
-    [max_delay => number | default = 300(s) | required=false]
-
-    [retries => number | default = 10 | required=false]
-
-    [username => string | default = nil | required=false]
-
-    [password => secret | default = nil | required=false]
-
-    [cert => path | default = nil | required=false]
-
-    [key => path | default = nil| required=false]
-
-    [ca_cert => path | default = nil | required=false]
-
-    [insecure_skip_verify => boolean | default = false | required=false]
+    url => "http://localhost:3100/loki/api/v1/push"
   }
 }
diff --git a/docker-compose/loki.yml b/docker-compose/loki.yml
index 0e5d38bb24ecec28e1a7bab8ebaf9c836a9b6a42..2007e16aa7e06726cc5b8be75553e4ef2df56475 100644
--- a/docker-compose/loki.yml
+++ b/docker-compose/loki.yml
@@ -35,4 +35,6 @@ services:
     command: -config.file=/etc/promtail/config.yml
     networks:
       - control
+    ports:
+      - "9080:9080"
     restart: unless-stopped