diff --git a/backend/Dockerfile b/backend/Dockerfile
index a5aae4c2a8..f335af2324 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -16,6 +16,8 @@ RUN go build .
 FROM debian:buster
 ARG service
 
+RUN apt-get update && apt-get install -y ca-certificates
+
 WORKDIR /app/
 
 COPY --from=build /build/$service/$service /app/service
diff --git a/backend/proxy/Dockerfile b/backend/proxy/Dockerfile
index 9a38a06255..cb7522cad2 100644
--- a/backend/proxy/Dockerfile
+++ b/backend/proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM envoyproxy/envoy:latest
+FROM envoyproxy/envoy:v1.13.0
 
 COPY ./envoy.yaml /etc/envoy/envoy.yaml
 
diff --git a/backend/proxy/envoy.yaml b/backend/proxy/envoy.yaml
index f0a5568331..eca02ae0c8 100644
--- a/backend/proxy/envoy.yaml
+++ b/backend/proxy/envoy.yaml
@@ -28,6 +28,10 @@ static_resources:
                           route:
                             cluster: identity_service
                             max_grpc_timeout: 0s
+                        - match: { prefix: '/spotify.backstage.builds.v1.Builds/' }
+                          route:
+                            cluster: builds_service
+                            max_grpc_timeout: 0s
                         - match: { prefix: '/inventory' }
                           route:
                             cluster: inventory_service
@@ -58,6 +62,15 @@ static_resources:
         - socket_address:
             address: identity
             port_value: 50051
+    - name: builds_service
+      connect_timeout: 0.25s
+      type: logical_dns
+      http2_protocol_options: {}
+      lb_policy: round_robin
+      hosts:
+        - socket_address:
+            address: builds
+            port_value: 50051
     - name: inventory_service
       connect_timeout: 0.25s
       type: logical_dns
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d9d5f2490b..76f8f4f1c7 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -37,3 +37,4 @@ services:
       args:
         service: scaffolder
     restart: unless-stopped
+    env_file: secrets.env