diff --git a/ooniapi/services/reverseproxy/Dockerfile b/ooniapi/services/reverseproxy/Dockerfile
index c8f8af53..c51c9504 100644
--- a/ooniapi/services/reverseproxy/Dockerfile
+++ b/ooniapi/services/reverseproxy/Dockerfile
@@ -1,4 +1,6 @@
 FROM nginx:1.27.1
 ENV TARGET_URL="https://backend-hel.ooni.org"
+ENV CLICKHOUSE_STREAM_TARGET="clickhouse1.prod.ooni.io:9000"
 
-COPY default.conf.template /etc/nginx/templates/
\ No newline at end of file
+COPY templates/backend-proxy.conf.template /etc/nginx/templates/
+COPY templates/clickhouse-proxy.conf.stream-template /etc/nginx/templates/
\ No newline at end of file
diff --git a/ooniapi/services/reverseproxy/buildspec.yml b/ooniapi/services/reverseproxy/buildspec.yml
new file mode 100644
index 00000000..3c736b7f
--- /dev/null
+++ b/ooniapi/services/reverseproxy/buildspec.yml
@@ -0,0 +1,29 @@
+version: 0.2
+env:
+  variables:
+    OONI_CODE_PATH: ooniapi/services/reverseproxy
+    DOCKERHUB_SECRET_ID: oonidevops/dockerhub/access_token
+
+phases:
+  install:
+    runtime-versions:
+      python: 3.11
+
+  pre_build:
+    commands:
+      - echo "Logging in to dockerhub"
+      - DOCKER_SECRET=$(aws secretsmanager get-secret-value --secret-id $DOCKERHUB_SECRET_ID --query SecretString --output text)
+      - echo $DOCKER_SECRET | docker login --username ooni --password-stdin
+
+  build:
+    commands:
+      - export GIT_FULL_SHA=${CODEBUILD_RESOLVED_SOURCE_VERSION}
+      - cd $OONI_CODE_PATH
+      - make docker-build
+      - make docker-smoketest
+      - make docker-push
+      - make imagedefinitions.json
+      - cat imagedefinitions.json | tee ${CODEBUILD_SRC_DIR}/imagedefinitions.json
+
+artifacts:
+  files: imagedefinitions.json
diff --git a/ooniapi/services/reverseproxy/default.conf.template b/ooniapi/services/reverseproxy/templates/backend-proxy.conf.template
similarity index 100%
rename from ooniapi/services/reverseproxy/default.conf.template
rename to ooniapi/services/reverseproxy/templates/backend-proxy.conf.template
diff --git a/ooniapi/services/reverseproxy/templates/clickhouse-proxy.conf.stream-template b/ooniapi/services/reverseproxy/templates/clickhouse-proxy.conf.stream-template
new file mode 100644
index 00000000..c3d0de42
--- /dev/null
+++ b/ooniapi/services/reverseproxy/templates/clickhouse-proxy.conf.stream-template
@@ -0,0 +1,8 @@
+upstream clickhouse_backend {
+    server ${CLICKHOUSE_STREAM_TARGET};
+}
+
+server {
+    listen 9000;
+    proxy_pass clickhouse_backend; 
+}
\ No newline at end of file