diff --git a/.ci/docker-compose.yml b/.ci/docker-compose.yml
index e48be59..decac78 100644
--- a/.ci/docker-compose.yml
+++ b/.ci/docker-compose.yml
@@ -18,5 +18,4 @@ services:
     container_name: ci_httpbin
     image: ghcr.io/mccutchen/go-httpbin:2.21
     ports:
-      - "127.0.0.1:8081:8081"
-    command: ["go-httpbin", "-port", "8081"]
+      - "127.0.0.1:8081:8080"
diff --git a/.devcontainer/.env b/.devcontainer/.env
index 027b82e..e52be5c 100644
--- a/.devcontainer/.env
+++ b/.devcontainer/.env
@@ -1,2 +1,2 @@
 GOTIFY_URI=http://gotify
-HTTPBIN_URI=http://httpbin:8081
+HTTPBIN_URI=http://httpbin:8080
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index e8a2471..7449717 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -28,8 +28,7 @@ services:
     container_name: gotify-httpbin
     image: ghcr.io/mccutchen/go-httpbin:2.21
     ports:
-      - "8081:8081"
-    command: ["go-httpbin", "-port", "8081"]
+      - "8081:8080"
 
 volumes:
   vendor: