diff --git a/packages/kolide/data_stream/audit/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/audit/_dev/deploy/docker/docker-compose.yml
index c8956852012..0a2f27b91ed 100644
--- a/packages/kolide/data_stream/audit/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/audit/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-audit:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-audit
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/audit/_dev/deploy/docker/files/config-audit.yml b/packages/kolide/data_stream/audit/_dev/deploy/docker/files/config-audit.yml
index e92077e879b..2fedf163969 100644
--- a/packages/kolide/data_stream/audit/_dev/deploy/docker/files/config-audit.yml
+++ b/packages/kolide/data_stream/audit/_dev/deploy/docker/files/config-audit.yml
@@ -51,7 +51,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
@@ -85,7 +85,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
+              "next": "http://{{ .request.host }}/audit_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
               "current_cursor": "CURSORPAGE2",
               "next_cursor": "CURSORPAGE3",
               "count": 1
diff --git a/packages/kolide/data_stream/auth/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/auth/_dev/deploy/docker/docker-compose.yml
index bcead2e4280..ea96c9bde17 100644
--- a/packages/kolide/data_stream/auth/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/auth/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-auth:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-auth
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/auth/_dev/deploy/docker/files/config-auth.yml b/packages/kolide/data_stream/auth/_dev/deploy/docker/files/config-auth.yml
index 3292f82cf4f..3409de8635b 100644
--- a/packages/kolide/data_stream/auth/_dev/deploy/docker/files/config-auth.yml
+++ b/packages/kolide/data_stream/auth/_dev/deploy/docker/files/config-auth.yml
@@ -69,7 +69,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
@@ -119,7 +119,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
+              "next": "http://{{ .request.host }}/auth_logs?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
               "current_cursor": "CURSORPAGE2",
               "next_cursor": "CURSORPAGE3",
               "count": 1
diff --git a/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/docker-compose.yml
index 3f16219119b..395e31ca645 100644
--- a/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-deprovisioned-person:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-deprovisioned-person
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/files/config-deprovisioned-person.yml b/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/files/config-deprovisioned-person.yml
index f7d4778d496..8cecc3a2b58 100644
--- a/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/files/config-deprovisioned-person.yml
+++ b/packages/kolide/data_stream/deprovisioned_person/_dev/deploy/docker/files/config-deprovisioned-person.yml
@@ -67,7 +67,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/deprovisioned_people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/deprovisioned_people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
diff --git a/packages/kolide/data_stream/device/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/device/_dev/deploy/docker/docker-compose.yml
index 899ec0a2005..c944f28f12f 100644
--- a/packages/kolide/data_stream/device/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/device/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-device:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-device
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/device/_dev/deploy/docker/files/config-device.yml b/packages/kolide/data_stream/device/_dev/deploy/docker/files/config-device.yml
index 61ccf355f40..022e17f5a6e 100644
--- a/packages/kolide/data_stream/device/_dev/deploy/docker/files/config-device.yml
+++ b/packages/kolide/data_stream/device/_dev/deploy/docker/files/config-device.yml
@@ -40,7 +40,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
+              "next": "http://{{ .request.host }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
               "current_cursor": "CURSORPAGE2",
               "next_cursor": "CURSORPAGE3",
               "count": 1
@@ -134,7 +134,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/devices?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
diff --git a/packages/kolide/data_stream/issues/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/issues/_dev/deploy/docker/docker-compose.yml
index c4414990389..9ed1d962a83 100644
--- a/packages/kolide/data_stream/issues/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/issues/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-issues:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-issues
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/issues/_dev/deploy/docker/files/config-issues.yml b/packages/kolide/data_stream/issues/_dev/deploy/docker/files/config-issues.yml
index 196fe651e7b..e1f4a98a05e 100644
--- a/packages/kolide/data_stream/issues/_dev/deploy/docker/files/config-issues.yml
+++ b/packages/kolide/data_stream/issues/_dev/deploy/docker/files/config-issues.yml
@@ -67,7 +67,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
@@ -108,7 +108,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
+              "next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE3",
               "current_cursor": "CURSORPAGE2",
               "next_cursor": "CURSORPAGE3",
               "count": 1
@@ -149,7 +149,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE4",
+              "next": "http://{{ .request.host }}/issues?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE4",
               "current_cursor": "CURSORPAGE3",
               "next_cursor": "CURSORPAGE4",
               "count": 1
diff --git a/packages/kolide/data_stream/people/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/people/_dev/deploy/docker/docker-compose.yml
index 69725d9e5b0..b595b7f2dea 100644
--- a/packages/kolide/data_stream/people/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/people/_dev/deploy/docker/docker-compose.yml
@@ -1,14 +1,12 @@
 version: '2.3'
 services:
   kolide-people:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-people
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
diff --git a/packages/kolide/data_stream/people/_dev/deploy/docker/files/config-people.yml b/packages/kolide/data_stream/people/_dev/deploy/docker/files/config-people.yml
index aa67ec75209..03b29e1ad93 100644
--- a/packages/kolide/data_stream/people/_dev/deploy/docker/files/config-people.yml
+++ b/packages/kolide/data_stream/people/_dev/deploy/docker/files/config-people.yml
@@ -67,7 +67,7 @@ rules:
               }
             ],
             "pagination": {
-              "next": "http://{{ hostname }}:{{ env "PORT" }}/people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
+              "next": "http://{{ .request.host }}/people?per_page={{ .request.vars.per_page }}&cursor=CURSORPAGE2",
               "current_cursor": "",
               "next_cursor": "CURSORPAGE2",
               "count": 1
diff --git a/packages/kolide/data_stream/request/_dev/deploy/docker/docker-compose.yml b/packages/kolide/data_stream/request/_dev/deploy/docker/docker-compose.yml
index 301bef959f3..2689fdb3fe2 100644
--- a/packages/kolide/data_stream/request/_dev/deploy/docker/docker-compose.yml
+++ b/packages/kolide/data_stream/request/_dev/deploy/docker/docker-compose.yml
@@ -1,27 +1,23 @@
 version: '2.3'
 services:
   kolide-request:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-request
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090
       - --config=/files/config-request.yml
   kolide-request-empty-registration:
-    image: docker.elastic.co/observability/stream:v0.20.0
+    image: docker.elastic.co/observability/stream:v0.23.0
     hostname: kolide-request-empty-registration
     ports:
       - 8090
     volumes:
       - ./files:/files:ro
-    environment:
-      PORT: '8090'
     command:
       - http-server
       - --addr=:8090