diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml
index fb17a0e4a..9522ecc38 100644
--- a/docker-compose/db-only-migrate.docker-compose.yaml
+++ b/docker-compose/db-only-migrate.docker-compose.yaml
@@ -13,7 +13,7 @@ services:
   #
   pgsql:
     container_name: pgsql
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres-12-alpine:5.8.0@sha256:44bced027c94ae8282ccf265dca8056ac6abad58309a52406de8140a99af0c5d'
+    image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.8.0@sha256:ba3f7141e6747f6027dc7d904cd209146d76d7a08069a4e6f9444478bc7c4017'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
@@ -30,7 +30,7 @@ services:
 
   codeintel-db:
     container_name: codeintel-db
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeintel-db:5.8.0@sha256:44bced027c94ae8282ccf265dca8056ac6abad58309a52406de8140a99af0c5d'
+    image: 'index.docker.io/sourcegraph/codeintel-db:5.8.0@sha256:ba3f7141e6747f6027dc7d904cd209146d76d7a08069a4e6f9444478bc7c4017'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 542ec1697..953eb9368 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   migrator:
     container_name: migrator
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:5.8.0@sha256:9804b2acf59e91a610b36cf09fe81cd5eac383cc60b9f1fb33286479cdf11325'
+    image: 'index.docker.io/sourcegraph/migrator:5.8.0@sha256:7a93083744fe9a8ab4b83dd7a6c8a2b815339bae1aff0417c757d799139b463c'
     cpus: 0.5
     mem_limit: '500m'
     command: ['up']
@@ -69,7 +69,7 @@ services:
   # https://caddyserver.com/docs/caddyfile
   caddy:
     container_name: caddy
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/caddy:5.8.0@sha256:dccd285c95ca282d240ff5bc022bd720438e4e168861131abef6395258ecba2d'
+    image: 'index.docker.io/sourcegraph/caddy:5.8.0@sha256:1535bf96a926410862bc1aed24951296d8a6acf6244cd9e93c92d539884855e8'
     cpus: 4
     mem_limit: '4g'
     environment:
@@ -124,7 +124,7 @@ services:
   # service.
   sourcegraph-frontend-0:
     container_name: sourcegraph-frontend-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.8.0@sha256:81c4e0f798d243ce97f3f14862662df9e7160940953c256d14e1202ee2581aac'
+    image: 'index.docker.io/sourcegraph/frontend:5.8.0@sha256:3b78eb53d0f614dd62b82f7178394a1b8c19cd583e166129d29a68f282ef279f'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -180,7 +180,7 @@ services:
   #
   sourcegraph-frontend-internal:
     container_name: sourcegraph-frontend-internal
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.8.0@sha256:81c4e0f798d243ce97f3f14862662df9e7160940953c256d14e1202ee2581aac'
+    image: 'index.docker.io/sourcegraph/frontend:5.8.0@sha256:3b78eb53d0f614dd62b82f7178394a1b8c19cd583e166129d29a68f282ef279f'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -227,7 +227,7 @@ services:
   #
   gitserver-0:
     container_name: gitserver-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:5.8.0@sha256:06775da9918033b764ffeee65fddb59ee59e1c095e5d6bc0d11b1bd73845e78c'
+    image: 'index.docker.io/sourcegraph/gitserver:5.8.0@sha256:8a05a3f10de93a6dab688ab2029c739d60c3f31f750341b3c900a65980f8bc0e'
     cpus: 4
     mem_limit: '8g'
     environment:
@@ -250,7 +250,7 @@ services:
   #
   zoekt-indexserver-0:
     container_name: zoekt-indexserver-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:5.8.0@sha256:52dae2b57c217569bd6102de60ee294cfd73b99f1facbec7bfd8ddd76c09041d'
+    image: 'index.docker.io/sourcegraph/search-indexer:5.8.0@sha256:ffa70f829fc8ac510004c3d0cb7ae291b261b7c19f4b25ad1186d159674cc1d3'
     cpus: 8
     mem_limit: '16g'
     environment:
@@ -273,7 +273,7 @@ services:
   #
   zoekt-webserver-0:
     container_name: zoekt-webserver-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:5.8.0@sha256:21a22273df26ca323316e289f95c70cda3edbff8e0a9151da32e1f3ed667ccaf'
+    image: 'index.docker.io/sourcegraph/indexed-searcher:5.8.0@sha256:dcfffede88becd19963857007fa90d2631e22ea150bdfbca9a493417b92aef7e'
     cpus: 8
     mem_limit: '50g'
     environment:
@@ -300,7 +300,7 @@ services:
   #
   searcher-0:
     container_name: searcher-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:5.8.0@sha256:c3cd3e74bc0df15a932d822c56b149b7b0bb3980f2da1f06cbb1084ffb4af4be'
+    image: 'index.docker.io/sourcegraph/searcher:5.8.0@sha256:10130baee086e8588019696b99ad1dcaab814e94c6d627d5e678512cc63c8a26'
     cpus: 2
     mem_limit: '2g'
     environment:
@@ -324,7 +324,7 @@ services:
   #
   precise-code-intel-worker:
     container_name: precise-code-intel-worker
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:5.8.0@sha256:9e96185acd62687d1132eb297956616d8049a4668570a1523c6a7bef183d833a'
+    image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.8.0@sha256:2dacbd7f0f23b9991210357de110082c40c129e4ff3ac26f089abaefaeeacf39'
     cpus: 2
     mem_limit: '4g'
     environment:
@@ -350,7 +350,7 @@ services:
   #
   repo-updater:
     container_name: repo-updater
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:5.8.0@sha256:ae51ddd03275b2df0f2315f2085ff71970b34598e5dcc55d9013868e560e3258'
+    image: 'index.docker.io/sourcegraph/repo-updater:5.8.0@sha256:4167c6198c1120c5e4f8aa062c01d4f2aba4f606d0fb4879743230c339928782'
     cpus: 4
     mem_limit: '4g'
     environment:
@@ -370,7 +370,7 @@ services:
   #
   worker:
     container_name: worker
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:5.8.0@sha256:71e37985595fb3309e6d788bd105f43f7bc974bfd8d941d0f3a6f8f37754e3f9'
+    image: 'index.docker.io/sourcegraph/worker:5.8.0@sha256:15409f0ea5aebc4eb291d96a74b4b1049a289890e62076c65879fe2ad393a9d8'
     cpus: 4
     mem_limit: '4g'
     environment:
@@ -396,7 +396,7 @@ services:
   #
   syntect-server:
     container_name: syntect-server
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:5.8.0@sha256:d74954151b56c1f26ac2ba35d26d1a885aeff3149045d03e27a56c95b9f4462e'
+    image: 'index.docker.io/sourcegraph/syntax-highlighter:5.8.0@sha256:4fbdb6bea5462a5ef0339bbc9033eedc3d15499674028982808f3e95d18a4fbf'
     cpus: 4
     mem_limit: '6g'
     healthcheck:
@@ -417,7 +417,7 @@ services:
   #
   symbols-0:
     container_name: symbols-0
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:5.8.0@sha256:3f7b19efaab4049c73345f2e1fa00ebbc20024bf618aabb8daaa4a2b7422a75c'
+    image: 'index.docker.io/sourcegraph/symbols:5.8.0@sha256:538e190f2585ec09c312469882b21a30ab726c58d424ac5c146a0105b0c8c3b0'
     cpus: 2
     mem_limit: '4g'
     environment:
@@ -443,7 +443,7 @@ services:
   #
   prometheus:
     container_name: prometheus
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:5.8.0@sha256:46dfcc1c0c14046c9fa02f628d35eed2aa63081fdb7cb686277521e67d660d5a'
+    image: 'index.docker.io/sourcegraph/prometheus:5.8.0@sha256:651650ec60c79dbe93be6db46466a6cbe2f3d8397af30895bacd2c285253b11f'
     cpus: 4
     mem_limit: '8g'
     volumes:
@@ -470,7 +470,7 @@ services:
   # 'GF_SERVER_ROOT_URL='https://grafana.example.com'
   grafana:
     container_name: grafana
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:5.8.0@sha256:6d9c0b07aadbc9d76886d3e199d69db1c8c391d5fa8e73ca17bd12b37f33ab6e'
+    image: 'index.docker.io/sourcegraph/grafana:5.8.0@sha256:9e34fc2e5df22f84c5f527986c7d640e1486f80f42edc5f12418ade873a205ed'
     cpus: 1
     mem_limit: '1g'
     volumes:
@@ -491,7 +491,7 @@ services:
   #
   cadvisor:
     container_name: cadvisor
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:5.8.0@sha256:94f128a9bd94ffa0d2cde0babffd6af5797038344543ded8df4c8e308b311eb3'
+    image: 'index.docker.io/sourcegraph/cadvisor:5.8.0@sha256:109f93e86e8dbf9c4397a3da5bccccb907eb54d9d86317245dd849805d41e842'
     cpus: 1
     mem_limit: '1g'
     # You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
@@ -524,7 +524,7 @@ services:
   #
   node-exporter:
     container_name: node-exporter
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:5.8.0@sha256:4432023259c718c9fc77ad0a1c3fb7d022b0fd95a7942469ac8398fcba0dec00'
+    image: 'index.docker.io/sourcegraph/node-exporter:5.8.0@sha256:1e01eb6a8caa63500c9b324bbc666802adf215e37ebdcb6c4d93df921c894074'
     cpus: .5
     mem_limit: '1g'
     pid: 'host'
@@ -553,7 +553,7 @@ services:
   #
   pgsql:
     container_name: pgsql
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres-12-alpine:5.8.0@sha256:44bced027c94ae8282ccf265dca8056ac6abad58309a52406de8140a99af0c5d'
+    image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.8.0@sha256:ba3f7141e6747f6027dc7d904cd209146d76d7a08069a4e6f9444478bc7c4017'
     cpus: 4
     mem_limit: '4g'
     shm_size: '1g'
@@ -581,7 +581,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   pgsql-exporter:
     container_name: pgsql-exporter
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.8.0@sha256:e101b54403b995f721a860398056602427fdb0e2fc885a9ad81fe73d1ba96048'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.8.0@sha256:e02ca582131234edb25c0fc6a5ebecb6dfd4f46840e266571eb3c85fc7bdfdb8'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -600,7 +600,7 @@ services:
   #
   codeintel-db:
     container_name: codeintel-db
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeintel-db:5.8.0@sha256:44bced027c94ae8282ccf265dca8056ac6abad58309a52406de8140a99af0c5d'
+    image: 'index.docker.io/sourcegraph/codeintel-db:5.8.0@sha256:ba3f7141e6747f6027dc7d904cd209146d76d7a08069a4e6f9444478bc7c4017'
     cpus: 4
     mem_limit: '4g'
     shm_size: '1g'
@@ -628,7 +628,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   codeintel-db-exporter:
     container_name: codeintel-db-exporter
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.8.0@sha256:e101b54403b995f721a860398056602427fdb0e2fc885a9ad81fe73d1ba96048'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.8.0@sha256:e02ca582131234edb25c0fc6a5ebecb6dfd4f46840e266571eb3c85fc7bdfdb8'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -647,7 +647,7 @@ services:
   #
   codeinsights-db:
     container_name: codeinsights-db
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeinsights-db:5.8.0@sha256:6ef3267f91f497cc727359b71b8c654182a5cafd2fbae07616de484f4df3f9bc'
+    image: 'index.docker.io/sourcegraph/codeinsights-db:5.8.0@sha256:5f7247a03594a215bd02c4802788693d21828ce70b98415d94cc147efb9d5cfb'
     cpus: 4
     mem_limit: '2g'
     shm_size: '1g'
@@ -680,7 +680,7 @@ services:
   # for this container will need to be updated to reflect the new connection information.
   codeinsights-db-exporter:
     container_name: codeinsights-db-exporter
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.8.0@sha256:e101b54403b995f721a860398056602427fdb0e2fc885a9ad81fe73d1ba96048'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.8.0@sha256:e02ca582131234edb25c0fc6a5ebecb6dfd4f46840e266571eb3c85fc7bdfdb8'
     cpus: 0.1
     mem_limit: '50m'
     networks:
@@ -699,7 +699,7 @@ services:
   #
   blobstore:
     container_name: blobstore
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:5.8.0@sha256:6fecbe48efae1c4116f8c90edd9d04ef04b741f23771a3bd632ed1ad2015fd71'
+    image: 'index.docker.io/sourcegraph/blobstore:5.8.0@sha256:d0fe27963d618f527ab4fcc2768e27fc114478b82206c394228db48619c34b5c'
     cpus: 1
     mem_limit: '1g'
     healthcheck:
@@ -722,7 +722,7 @@ services:
   #
   redis-cache:
     container_name: redis-cache
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:5.8.0@sha256:d2baa0608c644a3f6dc6fd28838e5d86ea7dce4df2bfa63804b954bd732417d9'
+    image: 'index.docker.io/sourcegraph/redis-cache:5.8.0@sha256:677ba0d1264f23dc20879e256e4c6c4004bbbfa35f0bb628fb98923b9025df26'
     cpus: 1
     mem_limit: '7g'
     volumes:
@@ -738,7 +738,7 @@ services:
   #
   redis-store:
     container_name: redis-store
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:5.8.0@sha256:18f62dfea9d5c4645b4f4ec6a06a5d86a1bc582ded1112cdd839c44a67971960'
+    image: 'index.docker.io/sourcegraph/redis-store:5.8.0@sha256:4d06523d3e2079ebb393147f087295cb5b4013e2d9a4fd7b72f98425ad74ff19'
     cpus: 1
     mem_limit: '7g'
     volumes:
@@ -753,7 +753,7 @@ services:
   # Ports exposed to the public internet: none
   otel-collector:
     container_name: otel-collector
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.8.0@sha256:592719c80f87ec5b5171ad8a86d0cf36c5e11dbd47623391b62ce668cd80b8a5'
+    image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.8.0@sha256:e28482d2699e875c1fc43c5780e3bf37f33a647725e4f73bb566aca21acb3a92'
     cpus: 1
     mem_limit: '1g'
     networks:
diff --git a/docker-compose/executors/executor.docker-compose.yaml b/docker-compose/executors/executor.docker-compose.yaml
index e551a1c76..e56f4f132 100644
--- a/docker-compose/executors/executor.docker-compose.yaml
+++ b/docker-compose/executors/executor.docker-compose.yaml
@@ -2,7 +2,7 @@ version: '2.4'
 services:
   executor:
     container_name: executor
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:5.8.0@sha256:249ee901ae28510b2cf0578864dc8371722124ff220ba870d121fd495ef27fab'
+    image: 'index.docker.io/sourcegraph/executor:5.8.0@sha256:c74cdf2530706128af5465ecef07d5a96c17bd67f5c6deff62a3661a26091fdf'
     cpus: 1
     mem_limit: '4g'
     # Run as root (required for docker daemon control)
diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml
index 2413d5b5b..9eac81fc9 100644
--- a/docker-compose/jaeger/docker-compose.yaml
+++ b/docker-compose/jaeger/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
   #
   jaeger:
     container_name: jaeger
-    image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:5.8.0@sha256:21cca738368409fa92eafc9c8807af06f76262bb080c4b2122d7c0099d942e11'
+    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:5.8.0@sha256:abb658f08b86160df6bf526d5290ec945fbf03cf3c46158a4ad747d233f2adcf'
     cpus: 0.5
     mem_limit: '512m'
     ports: