diff --git a/.github/workflows/apisix_dev_push_docker_hub.yaml b/.github/workflows/apisix_dev_push_docker_hub.yaml
index 49ea319a..dac474e2 100644
--- a/.github/workflows/apisix_dev_push_docker_hub.yaml
+++ b/.github/workflows/apisix_dev_push_docker_hub.yaml
@@ -40,7 +40,7 @@ jobs:
             "upstream": {
                 "type": "roundrobin",
                 "nodes": {
-                    "httpbin.org:80": 1
+                    "httpbin:80": 1
                 }
             }
           }'
diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml
index 8b087dff..198bea67 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -43,7 +43,7 @@ jobs:
             "upstream": {
                 "type": "roundrobin",
                 "nodes": {
-                    "httpbin.org:80": 1
+                    "httpbin:80": 1
                 }
             }
           }'
diff --git a/compose/docker-compose-master.yaml b/compose/docker-compose-master.yaml
index d92d52b6..16a5056f 100644
--- a/compose/docker-compose-master.yaml
+++ b/compose/docker-compose-master.yaml
@@ -50,6 +50,13 @@ services:
     networks:
       - apisix
 
+  # local upstream for CI route tests, avoids the flaky public httpbin.org
+  httpbin:
+    image: kennethreitz/httpbin
+    restart: always
+    networks:
+      - apisix
+
 networks:
   apisix:
     driver: bridge
diff --git a/compose/docker-compose-release.yaml b/compose/docker-compose-release.yaml
index 0e36fe58..798620ed 100644
--- a/compose/docker-compose-release.yaml
+++ b/compose/docker-compose-release.yaml
@@ -50,6 +50,13 @@ services:
     networks:
       - apisix
 
+  # local upstream for CI route tests, avoids the flaky public httpbin.org
+  httpbin:
+    image: kennethreitz/httpbin
+    restart: always
+    networks:
+      - apisix
+
 networks:
   apisix:
     driver: bridge