diff --git a/docker-compose.yml b/docker-compose.yml
index 7fdc83f8b..181b1085a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -295,8 +295,7 @@ services:
       cache_from:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/client:main
       args:
-        # TODO: Fix after #4516 lands
-        PACKAGE: firezone-linux-client
+        PACKAGE: firezone-headless-client
     # Add "standalone" to the command here once PR $4604 merges
     image: ${CLIENT_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/client}:${CLIENT_TAG:-main}
     cap_add:
diff --git a/rust/docker-compose-dev.yml b/rust/docker-compose-dev.yml
index a16bc347e..25139f414 100644
--- a/rust/docker-compose-dev.yml
+++ b/rust/docker-compose-dev.yml
@@ -6,6 +6,12 @@ services:
     volumes:
       - ./rust/target/x86_64-unknown-linux-musl/debug/firezone-headless-client:/bin/firezone-headless-client
 
+  download.httpbin:
+    build:
+      target: test
+    volumes:
+      - ./rust/target/x86_64-unknown-linux-musl/debug/http-test-server:/bin/http-test-server
+
   gateway:
     build:
       target: test