diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml
index fb17a0e4a..a8eaaa2b5 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:2d7e55b0f2e2de4cfd74dbd0fc4d6d476354db8b9be4f040618fbe16cc5514e7'
     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:2d7e55b0f2e2de4cfd74dbd0fc4d6d476354db8b9be4f040618fbe16cc5514e7'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 542ec1697..237207fe0 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:1f2c1f93d91f2a63e5e6033d8549fba8139d9a978521e8739ad9b8347baf006f'
     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:00b01fd5e7fc58587ba6568d0246eb56923721ab4ff1a442b14868fef697ac52'
     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:5d3ae78a14dc5395b5fc1fb699f5fcb39962b0e8589900611c04c435e298d450'
     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:5d3ae78a14dc5395b5fc1fb699f5fcb39962b0e8589900611c04c435e298d450'
     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:636ce7c427205ea838fd3f28588964b6f8ce7070ed992ef891a44f6e99d5089c'
     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:4012feb7a0dbeceb0cdd031db7aa2e986ea4688f752ef20c1f5eb323bd396c04'
     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:8b421f3bf93d71a191e2a241a6f7b2941a710e9e347cfd39d54ccdf261a6e2f4'
     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:d554e3dd7a1a3b41e79946bdb8d7faa1ae929f8243be8bce6d2c39cfee577f90'
     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:c3f0297e8c1301205029f4ff0a6f19feb6bbd5e4efd93e5963a9704e9e051c37'
     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:82f41063733744c5a5b0634d6dd3ca2a3585b9ff86bf1eccc9bf206a01b7df33'
     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:907adf23e9442533b1d8773b4a2380fe10d10ddc2517f68ee3b281095548ae14'
     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:0cc5c94e43e7bba756c43079169cdf51e6023283e87314ee9da31f595a797e95'
     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:f6c1943be9bbc637e62cb4d69b43c2b7ce6088a187c07337bcdd1f3c6c352e0e'
     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:f0236ede0409eb00ce83622fff6e6878d37843d8134cada265c1c15fc598e431'
     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:8780ebc75608bf3446f8bf1d6fbc688b4383bc0bf23ccf5d9aec72f1104a26fd'
     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:3e16d5b6892ab9c0178909e298e93a8fc7e5de137bc812ddf908ba00c60ba4b9'
     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:39578bac82f7856bfec4de09344688259d14551233a111891c8e14718d613b75'
     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:2d7e55b0f2e2de4cfd74dbd0fc4d6d476354db8b9be4f040618fbe16cc5514e7'
     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:0d167f2f35f12801ad35c016d67acb4d3a1323d31e657a51e3dddfe973677d09'
     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:2d7e55b0f2e2de4cfd74dbd0fc4d6d476354db8b9be4f040618fbe16cc5514e7'
     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:0d167f2f35f12801ad35c016d67acb4d3a1323d31e657a51e3dddfe973677d09'
     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:bcd66a34fbc00da4d1da53c6f74d7bd6f0d977d9f543d5a84ad20a55f4bca7f4'
     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:0d167f2f35f12801ad35c016d67acb4d3a1323d31e657a51e3dddfe973677d09'
     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:ec0e94c20205d5684a31a8030b35d399cadf43a3125a08d85f21aa3b662f5caa'
     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:9fc1f929d4017c193df6d281f0fe0459d87b10f1efaf0bb04c8052e2819d3b81'
     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:925fd63dbbf1ae2bff68a06973c6787143827a894e3f61d6e9c10f362b7406a9'
     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:9eec761d9142fbfdd03331e5c63f293d00c42a32ee4398fe0df60a8ad8b71473'
     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..4525fc327 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:a18005ff4424b6a0e88ef37a22897b58b5a016822fa46e7726ca1a3d72752921'
     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..d5d0b5e9f 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:6c5c15c1ee5a88f78d90ddad785bb6e59029ce5d667990db7ea5c68f97580ff9'
     cpus: 0.5
     mem_limit: '512m'
     ports: