diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml
index d04fc1bed..7090b73a8 100644
--- a/.github/workflows/_build_artifacts.yml
+++ b/.github/workflows/_build_artifacts.yml
@@ -33,6 +33,9 @@ on:
       gateway_image:
         description: "The gateway image that was built"
         value: ${{ jobs.data-plane.outputs.gateway_image }}
+      http_test_server_image:
+        description: "The http_test_server image that was built"
+        value: ${{ jobs.data-plane.outputs.http_test_server_image }}
 
 permissions:
   # write permission is required to create a github release
@@ -178,6 +181,7 @@ jobs:
       client_image: ${{ steps.image-name.outputs.client_image }}
       relay_image: ${{ steps.image-name.outputs.relay_image }}
       gateway_image: ${{ steps.image-name.outputs.gateway_image }}
+      http_test_server_image: ${{ steps.image-name.outputs.http_test_server_image }}
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml
index e672d9681..1a8c5f945 100644
--- a/.github/workflows/_integration_tests.yml
+++ b/.github/workflows/_integration_tests.yml
@@ -143,7 +143,7 @@ jobs:
           fi
 
           # Start one-by-one to avoid variability in service startup order
-          docker compose up -d dns.httpbin httpbin download.httpbin
+          docker compose up -d dns.httpbin httpbin download.httpbin --no-build
           docker compose up -d api web domain --no-build
           docker compose up -d otel --no-build
           docker compose up -d relay-1 --no-build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5b02d1ef0..b32c18dc2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,6 +100,7 @@ jobs:
       gateway_image: ${{ needs.build-artifacts.outputs.gateway_image }}
       client_image: ${{ needs.build-artifacts.outputs.client_image }}
       relay_image: ${{ needs.build-artifacts.outputs.relay_image }}
+      http_test_server_image: ${{ needs.build-artifacts.outputs.http_test_server_image }}
 
   snownet-tests:
     needs: build-artifacts
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ad5d6652..cdca568bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -324,7 +324,7 @@ services:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/client:main
       args:
         PACKAGE: firezone-headless-client
-    image: ${CLIENT_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/client}:${CLIENT_TAG:-main}
+    image: ${CLIENT_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/debug/client}:${CLIENT_TAG:-main}
     cap_add:
       - NET_ADMIN
     sysctls:
@@ -355,7 +355,7 @@ services:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/gateway:main
       args:
         PACKAGE: firezone-gateway
-    image: ${GATEWAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/gateway}:${GATEWAY_TAG:-main}
+    image: ${GATEWAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/debug/gateway}:${GATEWAY_TAG:-main}
     cap_add:
       - NET_ADMIN
     sysctls:
@@ -392,7 +392,7 @@ services:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/http-test-server:main
       args:
         PACKAGE: http-test-server
-    image: ${HTTP_TEST_SERVER_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/http-test-server}:${HTTP_TEST_SERVER_TAG:-main}
+    image: ${HTTP_TEST_SERVER_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/debug/http-test-server}:${HTTP_TEST_SERVER_TAG:-main}
     environment:
       PORT: 80
     networks:
@@ -438,7 +438,7 @@ services:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/relay:main
       args:
         PACKAGE: firezone-relay
-    image: ${RELAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/relay}:${RELAY_TAG:-main}
+    image: ${RELAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/debug/relay}:${RELAY_TAG:-main}
     healthcheck:
       test: ["CMD-SHELL", "lsof -i UDP | grep firezone-relay"]
       start_period: 10s
@@ -479,7 +479,7 @@ services:
         - type=registry,ref=us-east1-docker.pkg.dev/firezone-staging/cache/relay:main
       args:
         PACKAGE: firezone-relay
-    image: ${RELAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/dev/relay}:${RELAY_TAG:-main}
+    image: ${RELAY_IMAGE:-us-east1-docker.pkg.dev/firezone-staging/firezone/debug/relay}:${RELAY_TAG:-main}
     healthcheck:
       test: ["CMD-SHELL", "lsof -i UDP | grep firezone-relay"]
       start_period: 10s
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 6f52ade6f..e47eb548b 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -89,7 +89,7 @@ You should now be able to connect to `http://localhost:8080/<account-uuid-here>`
 and sign in with the following credentials:
 
 ```text
-Email:    firezone@localhost
+Email:    firezone@localhost.local
 Password: Firezone1234
 ```
 
diff --git a/elixir/README.md b/elixir/README.md
index 185b81021..3dd1c8b60 100644
--- a/elixir/README.md
+++ b/elixir/README.md
@@ -216,7 +216,7 @@ context = %Domain.Auth.Context{type: :client, user_agent: user_agent, remote_ip:
 # For an admin user, imitating the browser session
 context = %Domain.Auth.Context{type: :browser, user_agent: user_agent, remote_ip: remote_ip}
 provider = Domain.Repo.get_by(Domain.Auth.Provider, adapter: :userpass)
-identity = Domain.Repo.get_by(Domain.Auth.Identity, provider_id: provider.id, provider_identifier: "firezone@localhost")
+identity = Domain.Repo.get_by(Domain.Auth.Identity, provider_id: provider.id, provider_identifier: "firezone@localhost.local")
 token = Domain.Auth.create_token(identity, context, "", nil)
 browser_token = Domain.Tokens.encode_fragment!(token)
 {:ok, subject} = Domain.Auth.authenticate(browser_token, context)
diff --git a/elixir/apps/domain/priv/repo/seeds.exs b/elixir/apps/domain/priv/repo/seeds.exs
index 7c77e11e2..5014f81c5 100644
--- a/elixir/apps/domain/priv/repo/seeds.exs
+++ b/elixir/apps/domain/priv/repo/seeds.exs
@@ -125,8 +125,8 @@ IO.puts("")
     adapter_config: %{}
   })
 
-unprivileged_actor_email = "firezone-unprivileged-1@localhost"
-admin_actor_email = "firezone@localhost"
+unprivileged_actor_email = "firezone-unprivileged-1@localhost.local"
+admin_actor_email = "firezone@localhost.local"
 
 {:ok, unprivileged_actor} =
   Actors.create_actor(account, %{
@@ -204,8 +204,8 @@ admin_actor_oidc_identity
 |> Repo.update!()
 
 # Other Account Users
-other_unprivileged_actor_email = "other-unprivileged-1@localhost"
-other_admin_actor_email = "other@localhost"
+other_unprivileged_actor_email = "other-unprivileged-1@localhost.local"
+other_admin_actor_email = "other@localhost.local"
 
 {:ok, other_unprivileged_actor} =
   Actors.create_actor(other_account, %{