diff --git a/grafana/Caddyfile b/grafana/Caddyfile
index 21bbb81..ddffbc1 100644
--- a/grafana/Caddyfile
+++ b/grafana/Caddyfile
@@ -1,7 +1,12 @@
 grafana.codedang.com {
-	handle /loki/* {
-		uri strip_prefix /loki
-		reverse_proxy 127.0.0.1:3200
+	handle /lokiaws/* {
+		uri strip_prefix /lokiaws
+		reverse_proxy 127.0.0.1:3100
+	}
+
+	handle /lokitest/* {
+		uri strip_prefix /lokitest
+		reverse_proxy 127.0.0.1:3199
 	}
 
 	handle {
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index fb6a3b1..0ccb44f 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     image: grafana/loki:2.9.0
     container_name: loki-test
     ports:
-      - "3100:3100"
+      - "3199:3100"
     volumes:
       - '$PWD/loki-config-test.yml:/etc/loki/loki-config.yml'
     command: -config.file=/etc/loki/loki-config.yml
@@ -19,12 +19,24 @@ services:
     image: grafana/loki:2.9.0
     container_name: loki-stage
     ports:
-      - "3200:3100"
+      - "3101:3100"
     volumes:
       - '$PWD/loki-config-stage.yml:/etc/loki/loki-config.yml'
     command: -config.file=/etc/loki/loki-config.yml
     networks:
-      - loki 
+      - loki
+
+  loki-aws:
+    image: grafana/loki:2.9.0
+    container_name: loki-aws
+    ports:
+      - "3100:3100"
+    volumes:
+      - '$PWD/loki-config-aws.yml:/etc/loki/loki-config.yml'
+    command: -config.file=/etc/loki/loki-config.yml
+    networks:
+      - loki
+
 
   grafana:
     image: grafana/grafana:latest
diff --git a/grafana/loki-config-aws.yml b/grafana/loki-config-aws.yml
new file mode 100644
index 0000000..68c3c9f
--- /dev/null
+++ b/grafana/loki-config-aws.yml
@@ -0,0 +1,50 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /tmp/loki
+  storage:
+    filesystem:
+      chunks_directory: /tmp/loki/chunks
+      rules_directory: /tmp/loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+query_range:
+  results_cache:
+    cache:
+      embedded_cache:
+        enabled: true
+        max_size_mb: 100
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: boltdb-shipper
+      object_store: filesystem
+      schema: v11
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false