diff --git a/etc/bento.env b/etc/bento.env
index 01bffbbb..f6d9214f 100644
--- a/etc/bento.env
+++ b/etc/bento.env
@@ -278,7 +278,7 @@ BENTOV2_KATSU_DB_CPUS=4
 
 # Katsu
 BENTOV2_KATSU_IMAGE=ghcr.io/bento-platform/katsu
-BENTOV2_KATSU_VERSION=9.1.0
+BENTOV2_KATSU_VERSION=pr-536
 BENTOV2_KATSU_VERSION_DEV=${BENTOV2_KATSU_VERSION}-dev
 BENTOV2_KATSU_CONTAINER_NAME=${BENTOV2_PREFIX}-katsu
 BENTO_KATSU_NETWORK=${BENTOV2_PREFIX}-katsu-net
@@ -301,7 +301,7 @@ CHORD_METADATA_SUB_PATH=/api/metadata
 
 # Canonical/world-resolvable URL for Katsu
 #  TODO: services should use the service registry instead
-BENTO_KATSU_URL=${BENTOV2_PORTAL_PUBLIC_URL}${CHORD_METADATA_SUB_PATH}
+BENTO_KATSU_URL=${BENTOV2_PUBLIC_URL}${CHORD_METADATA_SUB_PATH}
 
 # Redis
 BENTOV2_REDIS_BASE_IMAGE=redis
@@ -387,7 +387,7 @@ BENTOV2_GOHAN_PRIVATE_AUTHZ_URL=http://${BENTOV2_GOHAN_AUTHZ_OPA_CONTAINER_NAME}
 # Bento-Public
 
 BENTO_PUBLIC_IMAGE=ghcr.io/bento-platform/bento_public
-BENTO_PUBLIC_VERSION=edge
+BENTO_PUBLIC_VERSION=pr-240
 BENTO_PUBLIC_VERSION_DEV=${BENTO_PUBLIC_VERSION}-dev
 BENTO_PUBLIC_CONTAINER_NAME=${BENTOV2_PREFIX}-public
 BENTO_PUBLIC_NETWORK=${BENTOV2_PREFIX}-public-net
@@ -407,7 +407,7 @@ BENTO_PUBLIC_PORTAL_URL=${BENTOV2_PORTAL_PUBLIC_URL}
 BENTO_BEACON_CONTAINER_NAME=${BENTOV2_PREFIX}-beacon
 BENTO_BEACON_NETWORK=${BENTOV2_PREFIX}-beacon-net
 BENTO_BEACON_IMAGE=ghcr.io/bento-platform/bento_beacon
-BENTO_BEACON_VERSION=edge
+BENTO_BEACON_VERSION=pr-120
 BENTO_BEACON_VERSION_DEV=${BENTO_BEACON_VERSION}-dev
 BENTO_BEACON_INTERNAL_PORT=${BENTO_STD_SERVICE_INTERNAL_PORT}
 BENTO_BEACON_EXTERNAL_PORT=5000
diff --git a/etc/bento_services.json b/etc/bento_services.json
index 6980180e..8faebdea 100644
--- a/etc/bento_services.json
+++ b/etc/bento_services.json
@@ -36,7 +36,7 @@
   },
   "katsu": {
     "service_kind": "metadata",
-    "url_template": "{BENTO_PORTAL_PUBLIC_URL}/api/{service_kind}",
+    "url_template": "{BENTO_PUBLIC_URL}/api/{service_kind}",
     "repository": "git@github.com:bento-platform/katsu.git"
   },
   "drs": {
diff --git a/lib/gateway/services/katsu.conf.tpl b/lib/gateway/public_services/katsu.conf.tpl
similarity index 75%
rename from lib/gateway/services/katsu.conf.tpl
rename to lib/gateway/public_services/katsu.conf.tpl
index 6e265483..27d3459f 100644
--- a/lib/gateway/services/katsu.conf.tpl
+++ b/lib/gateway/public_services/katsu.conf.tpl
@@ -1,9 +1,8 @@
-location /api/metadata { return 302 https://${BENTOV2_PORTAL_DOMAIN}/api/metadata/; }
+location /api/metadata { return 302 https://${BENTOV2_DOMAIN}/api/metadata/; }
 location /api/metadata/ {
     # Reverse proxy settings
     include /gateway/conf/proxy.conf;
     include /gateway/conf/proxy_extra.conf;
-    include /gateway/conf/proxy_private.conf;
 
     # Forward request to Katsu
     rewrite ^ $request_uri;
diff --git a/lib/katsu/docker-compose.katsu.yaml b/lib/katsu/docker-compose.katsu.yaml
index f2c0b176..470b3114 100644
--- a/lib/katsu/docker-compose.katsu.yaml
+++ b/lib/katsu/docker-compose.katsu.yaml
@@ -15,7 +15,6 @@ services:
     environment:
       - BENTO_UID
       - CHORD_URL=${BENTOV2_PORTAL_PUBLIC_URL}
-      - CHORD_PERMISSIONS=False  # Keep off since we have the proxy handling everything for now
       - CHORD_DEBUG=False
       - CHORD_METADATA_SUB_PATH
       - INTERNAL_PORT=${BENTOV2_KATSU_INTERNAL_PORT}