diff --git a/compose.yaml b/compose.yaml
index 5216f09..3679044 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,16 +1,5 @@
 
 services:
-  # redis server holds the catalog data blob
-  redis:
-    image: redis:alpine
-    container_name: redis
-    command: ["redis-server", "--appendonly", "yes"]
-    volumes:
-      - ./redis-data:/data
-    ports:
-      - "6379:6379"
-    restart: always
-
   # STAC Server
   stac_server:
     # image: stac-server:latest
@@ -20,26 +9,24 @@ services:
       dockerfile: Dockerfile
       target: stac_server
     ports:
-      - "8124:8080"
+      - "8124:80"
     environment:
-      - REDIS_HOST=redis
       - CONFIG_DIR=/config
     volumes:
       - ./stac_server:/code/stac_server
-      - ./TreeTraverser:/code/TreeTraverser
     # restart: always
 
-  # web_query_builder:
-  #   # image: web_query_builder:latest
-  #   container_name: web_query_builder
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile
-  #     target: web_query_builder
-  #   ports:
-  #     - "8125:8080"
-  #   environment:
-  #     - CONFIG_DIR=/config
-  #   volumes:
-  #     - ./web_query_builder:/code/web_query_builder
-    # restart: always
+  web_query_builder:
+    # image: web_query_builder:latest
+    container_name: web_query_builder
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: web_query_builder
+    ports:
+      - "8125:80"
+    environment:
+      - API_URL=http://127.0.0.1:8124/api/v1/stac/climate-dt
+    volumes:
+      - ./web_query_builder:/code/web_query_builder
+    restart: always
diff --git a/dockerfile b/dockerfile
index 3121266..e3b62ec 100644
--- a/dockerfile
+++ b/dockerfile
@@ -24,22 +24,12 @@ FROM base AS stac_server
 COPY stac_server/requirements.txt /code/requirements.txt
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-# Todo: don't embed this here, mount them at runtime
-# ENV CONFIG_DIR=/config/
-# COPY config/destinE/config.yaml /config/config.yaml
-# COPY config/destinE/schema /config/schema
-# COPY config/destinE/language.yaml /config/language.yaml
+COPY ./src /code/qubed/src
+COPY ./pyproject.toml /code/qubed/
+COPY ./Cargo.toml /code/qubed/
+COPY ./README.md /code/qubed/
 
-COPY ./tree_compresser /code/tree_compresser
-
-# Clone the rsfdb and rsfindlibs repos manually because they're private
-
-# RUN --mount=type=ssh git clone ssh://git@github.com/ecmwf/rsfdb.git
-# RUN --mount=type=ssh git clone ssh://git@github.com/ecmwf/rsfindlibs.git
-COPY stac_server/deps/rsfdb /code/rsfdb
-COPY stac_server/deps/rsfindlibs /code/rsfindlibs
-
-RUN pip install --no-cache-dir -e /code/tree_compresser
+RUN pip install --no-cache-dir -e /code/qubed
 COPY ./stac_server /code/stac_server
 
 WORKDIR /code/stac_server
diff --git a/stac_server/requirements.txt b/stac_server/requirements.txt
index aa8f272..857a4cf 100644
--- a/stac_server/requirements.txt
+++ b/stac_server/requirements.txt
@@ -2,3 +2,4 @@ fastapi[standard]
 pe
 redis
 frozendict
+requests