diff --git a/.docker_compose/config.yaml b/.docker_compose/config.yaml
index de024a758f..97852b83cb 100644
--- a/.docker_compose/config.yaml
+++ b/.docker_compose/config.yaml
@@ -46,3 +46,16 @@ authenticators:
     enabled: true
     config:
       subject: guest
+log:
+  level: trace
+  format: json
+
+tracing:
+  provider: jaeger
+  service_name: ory:oathkeeper
+  providers:
+    jaeger:
+      local_agent_address: jaeger:6831
+      sampling:
+        server_url: http://jaeger:5778/sampling
+        trace_id_ratio: 1
diff --git a/docker-compose.yml b/docker-compose.yml
index d0af900592..a235b514cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,33 +1,31 @@
-version: "3.7"
-
 services:
   oathkeeper:
     build:
       context: .
-      dockerfile: Dockerfile-dc
+      dockerfile: .docker/Dockerfile-build
     ports:
       - "4455:4455"
       - "4456:4456"
     command: serve --config=/etc/config/oathkeeper/config.yaml
-    environment:
-      - TRACING_PROVIDER=jaeger
-      - TRACING_PROVIDER_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
-      - TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
-      - TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
-      - TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
+    # environment:
+    #   - TRACING_PROVIDER=jaeger
+    #   - TRACING_PROVIDERS_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
+    #   - TRACING_PROVIDERS_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
+    #   - TRACING_PROVIDERS_JAEGER_SAMPLING_TYPE=const
+    #   - TRACING_PROVIDERS_JAEGER_SAMPLING_VALUE=1
     volumes:
       - type: bind
         source: ./.docker_compose
         target: /etc/config/oathkeeper
     restart: on-failure
   jaeger:
-    image: jaegertracing/all-in-one
+    image: jaegertracing/jaeger
     ports:
       - "16686:16686" # The UI port
-#      These are ports for collecting, sampling, agents, ...
-#      - "5775:5775/udp"
-#      - "6831:6831/udp"
-#      - "6832:6832/udp"
-#      - "5778:5778"
-#      - "14268:14268"
-#      - "9411:9411"
+      # These are ports for collecting, sampling, agents, ...
+      - "5775:5775/udp"
+      - "6831:6831/udp"
+      - "6832:6832/udp"
+      - "5778:5778"
+      - "14268:14268"
+      - "9411:9411"