diff --git a/packages/bsky/src/index.ts b/packages/bsky/src/index.ts
index b0967cfaee9..df8476f7f36 100644
--- a/packages/bsky/src/index.ts
+++ b/packages/bsky/src/index.ts
@@ -38,7 +38,6 @@ export class BskyAppView {
   public app: express.Application
   public server?: http.Server
   private terminator?: HttpTerminator
-  private dbStatsInterval: NodeJS.Timer
 
   constructor(opts: { ctx: AppContext; app: express.Application }) {
     this.ctx = opts.ctx
diff --git a/packages/dev-env/src/bsky.ts b/packages/dev-env/src/bsky.ts
index 5f19aae8cc1..3b726f2a096 100644
--- a/packages/dev-env/src/bsky.ts
+++ b/packages/dev-env/src/bsky.ts
@@ -57,7 +57,6 @@ export class TestBsky {
       serverDid,
       dataplaneUrl: `http://localhost:${dataplanePort}`,
       ...cfg,
-      // Each test suite gets its own lock id for the repo subscription
       adminPassword: ADMIN_PASSWORD,
       moderatorPassword: MOD_PASSWORD,
       triagePassword: TRIAGE_PASSWORD,
@@ -83,6 +82,7 @@ export class TestBsky {
       config,
       didCache,
       signingKey: serviceKeypair,
+      algos: cfg.algos,
     })
 
     const sub = new bsky.RepoSubscription({
diff --git a/packages/dev-env/src/types.ts b/packages/dev-env/src/types.ts
index 5a182b66037..6cbe81ec6f5 100644
--- a/packages/dev-env/src/types.ts
+++ b/packages/dev-env/src/types.ts
@@ -1,6 +1,5 @@
 import * as pds from '@atproto/pds'
 import * as bsky from '@atproto/bsky'
-import { ImageInvalidator } from '@atproto/bsky/src/image/invalidator'
 
 export type PlcConfig = {
   port?: number
@@ -19,8 +18,8 @@ export type BskyConfig = Partial<bsky.ServerConfig> & {
   dbPostgresSchema: string
   redisHost: string
   pdsPort: number
-  imgInvalidator?: ImageInvalidator
   migration?: string
+  algos?: bsky.MountedAlgos
 }
 
 export type TestServerParams = {
diff --git a/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap
index 107ae5667be..01002de0be5 100644
--- a/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap
@@ -2,958 +2,6 @@
 
 exports[`feedgen proxy view performs basic proxy of getFeed 1`] = `
 Object {
-  "cursor": "0000000000000::bafycid",
-  "feed": Array [
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-          "did": "user(0)",
-          "displayName": "ali",
-          "handle": "alice.test",
-          "labels": Array [
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-a",
-            },
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-b",
-            },
-          ],
-          "viewer": Object {
-            "blockedBy": false,
-            "muted": false,
-          },
-        },
-        "cid": "cids(0)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "reply": Object {
-            "parent": Object {
-              "cid": "cids(4)",
-              "uri": "record(3)",
-            },
-            "root": Object {
-              "cid": "cids(3)",
-              "uri": "record(2)",
-            },
-          },
-          "text": "thanks bob",
-        },
-        "replyCount": 0,
-        "repostCount": 1,
-        "uri": "record(0)",
-        "viewer": Object {},
-      },
-      "reply": Object {
-        "parent": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
-            "did": "user(2)",
-            "displayName": "bobby",
-            "handle": "bob.test",
-            "labels": Array [],
-            "viewer": Object {
-              "blockedBy": false,
-              "followedBy": "record(5)",
-              "following": "record(4)",
-              "muted": false,
-            },
-          },
-          "cid": "cids(4)",
-          "embed": Object {
-            "$type": "app.bsky.embed.images#view",
-            "images": Array [
-              Object {
-                "alt": "tests/sample-img/key-landscape-small.jpg",
-                "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
-                "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
-              },
-            ],
-          },
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label",
-            },
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label-2",
-            },
-          ],
-          "likeCount": 0,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000Z",
-            "embed": Object {
-              "$type": "app.bsky.embed.images",
-              "images": Array [
-                Object {
-                  "alt": "tests/sample-img/key-landscape-small.jpg",
-                  "image": Object {
-                    "$type": "blob",
-                    "mimeType": "image/jpeg",
-                    "ref": Object {
-                      "$link": "cids(5)",
-                    },
-                    "size": 4114,
-                  },
-                },
-              ],
-            },
-            "reply": Object {
-              "parent": Object {
-                "cid": "cids(3)",
-                "uri": "record(2)",
-              },
-              "root": Object {
-                "cid": "cids(3)",
-                "uri": "record(2)",
-              },
-            },
-            "text": "hear that label_me label_me_2",
-          },
-          "replyCount": 1,
-          "repostCount": 0,
-          "uri": "record(3)",
-          "viewer": Object {},
-        },
-        "root": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-            "did": "user(0)",
-            "displayName": "ali",
-            "handle": "alice.test",
-            "labels": Array [
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-a",
-              },
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-b",
-              },
-            ],
-            "viewer": Object {
-              "blockedBy": false,
-              "muted": false,
-            },
-          },
-          "cid": "cids(3)",
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [],
-          "likeCount": 3,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000000Z",
-            "text": "again",
-          },
-          "replyCount": 2,
-          "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
-        },
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "did": "user(4)",
-          "handle": "carol.test",
-          "labels": Array [],
-          "viewer": Object {
-            "blockedBy": false,
-            "followedBy": "record(8)",
-            "following": "record(7)",
-            "muted": false,
-          },
-        },
-        "cid": "cids(6)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "reply": Object {
-            "parent": Object {
-              "cid": "cids(3)",
-              "uri": "record(2)",
-            },
-            "root": Object {
-              "cid": "cids(3)",
-              "uri": "record(2)",
-            },
-          },
-          "text": "of course",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(6)",
-        "viewer": Object {},
-      },
-      "reply": Object {
-        "parent": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-            "did": "user(0)",
-            "displayName": "ali",
-            "handle": "alice.test",
-            "labels": Array [
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-a",
-              },
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-b",
-              },
-            ],
-            "viewer": Object {
-              "blockedBy": false,
-              "muted": false,
-            },
-          },
-          "cid": "cids(3)",
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [],
-          "likeCount": 3,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000000Z",
-            "text": "again",
-          },
-          "replyCount": 2,
-          "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
-        },
-        "root": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-            "did": "user(0)",
-            "displayName": "ali",
-            "handle": "alice.test",
-            "labels": Array [
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-a",
-              },
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-b",
-              },
-            ],
-            "viewer": Object {
-              "blockedBy": false,
-              "muted": false,
-            },
-          },
-          "cid": "cids(3)",
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [],
-          "likeCount": 3,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000000Z",
-            "text": "again",
-          },
-          "replyCount": 2,
-          "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
-        },
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
-          "did": "user(2)",
-          "displayName": "bobby",
-          "handle": "bob.test",
-          "labels": Array [],
-          "viewer": Object {
-            "blockedBy": false,
-            "followedBy": "record(5)",
-            "following": "record(4)",
-            "muted": false,
-          },
-        },
-        "cid": "cids(4)",
-        "embed": Object {
-          "$type": "app.bsky.embed.images#view",
-          "images": Array [
-            Object {
-              "alt": "tests/sample-img/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
-            },
-          ],
-        },
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label",
-          },
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label-2",
-          },
-        ],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "embed": Object {
-            "$type": "app.bsky.embed.images",
-            "images": Array [
-              Object {
-                "alt": "tests/sample-img/key-landscape-small.jpg",
-                "image": Object {
-                  "$type": "blob",
-                  "mimeType": "image/jpeg",
-                  "ref": Object {
-                    "$link": "cids(5)",
-                  },
-                  "size": 4114,
-                },
-              },
-            ],
-          },
-          "reply": Object {
-            "parent": Object {
-              "cid": "cids(3)",
-              "uri": "record(2)",
-            },
-            "root": Object {
-              "cid": "cids(3)",
-              "uri": "record(2)",
-            },
-          },
-          "text": "hear that label_me label_me_2",
-        },
-        "replyCount": 1,
-        "repostCount": 0,
-        "uri": "record(3)",
-        "viewer": Object {},
-      },
-      "reply": Object {
-        "parent": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-            "did": "user(0)",
-            "displayName": "ali",
-            "handle": "alice.test",
-            "labels": Array [
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-a",
-              },
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-b",
-              },
-            ],
-            "viewer": Object {
-              "blockedBy": false,
-              "muted": false,
-            },
-          },
-          "cid": "cids(3)",
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [],
-          "likeCount": 3,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000000Z",
-            "text": "again",
-          },
-          "replyCount": 2,
-          "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
-        },
-        "root": Object {
-          "$type": "app.bsky.feed.defs#postView",
-          "author": Object {
-            "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-            "did": "user(0)",
-            "displayName": "ali",
-            "handle": "alice.test",
-            "labels": Array [
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-a",
-              },
-              Object {
-                "cid": "cids(2)",
-                "cts": "1970-01-01T00:00:00.000Z",
-                "neg": false,
-                "src": "user(0)",
-                "uri": "record(1)",
-                "val": "self-label-b",
-              },
-            ],
-            "viewer": Object {
-              "blockedBy": false,
-              "muted": false,
-            },
-          },
-          "cid": "cids(3)",
-          "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [],
-          "likeCount": 3,
-          "record": Object {
-            "$type": "app.bsky.feed.post",
-            "createdAt": "1970-01-01T00:00:00.000000Z",
-            "text": "again",
-          },
-          "replyCount": 2,
-          "repostCount": 1,
-          "uri": "record(2)",
-          "viewer": Object {},
-        },
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-          "did": "user(0)",
-          "displayName": "ali",
-          "handle": "alice.test",
-          "labels": Array [
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-a",
-            },
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-b",
-            },
-          ],
-          "viewer": Object {
-            "blockedBy": false,
-            "muted": false,
-          },
-        },
-        "cid": "cids(7)",
-        "embed": Object {
-          "$type": "app.bsky.embed.record#view",
-          "record": Object {
-            "$type": "app.bsky.embed.record#viewRecord",
-            "author": Object {
-              "did": "user(5)",
-              "handle": "dan.test",
-              "labels": Array [
-                Object {
-                  "cts": "1970-01-01T00:00:00.000Z",
-                  "neg": false,
-                  "src": "did:example:labeler",
-                  "uri": "user(5)",
-                  "val": "repo-action-label",
-                },
-              ],
-              "viewer": Object {
-                "blockedBy": false,
-                "following": "record(11)",
-                "muted": false,
-              },
-            },
-            "cid": "cids(8)",
-            "embeds": Array [
-              Object {
-                "$type": "app.bsky.embed.record#view",
-                "record": Object {
-                  "$type": "app.bsky.embed.record#viewRecord",
-                  "author": Object {
-                    "did": "user(4)",
-                    "handle": "carol.test",
-                    "labels": Array [],
-                    "viewer": Object {
-                      "blockedBy": false,
-                      "followedBy": "record(8)",
-                      "following": "record(7)",
-                      "muted": false,
-                    },
-                  },
-                  "cid": "cids(9)",
-                  "indexedAt": "1970-01-01T00:00:00.000Z",
-                  "labels": Array [],
-                  "uri": "record(12)",
-                  "value": Object {
-                    "$type": "app.bsky.feed.post",
-                    "createdAt": "1970-01-01T00:00:00.000Z",
-                    "embed": Object {
-                      "$type": "app.bsky.embed.recordWithMedia",
-                      "media": Object {
-                        "$type": "app.bsky.embed.images",
-                        "images": Array [
-                          Object {
-                            "alt": "tests/sample-img/key-landscape-small.jpg",
-                            "image": Object {
-                              "$type": "blob",
-                              "mimeType": "image/jpeg",
-                              "ref": Object {
-                                "$link": "cids(5)",
-                              },
-                              "size": 4114,
-                            },
-                          },
-                          Object {
-                            "alt": "tests/sample-img/key-alt.jpg",
-                            "image": Object {
-                              "$type": "blob",
-                              "mimeType": "image/jpeg",
-                              "ref": Object {
-                                "$link": "cids(10)",
-                              },
-                              "size": 12736,
-                            },
-                          },
-                        ],
-                      },
-                      "record": Object {
-                        "record": Object {
-                          "cid": "cids(11)",
-                          "uri": "record(13)",
-                        },
-                      },
-                    },
-                    "text": "hi im carol",
-                  },
-                },
-              },
-            ],
-            "indexedAt": "1970-01-01T00:00:00.000Z",
-            "labels": Array [],
-            "uri": "record(10)",
-            "value": Object {
-              "$type": "app.bsky.feed.post",
-              "createdAt": "1970-01-01T00:00:00.000Z",
-              "embed": Object {
-                "$type": "app.bsky.embed.record",
-                "record": Object {
-                  "cid": "cids(9)",
-                  "uri": "record(12)",
-                },
-              },
-              "facets": Array [
-                Object {
-                  "features": Array [
-                    Object {
-                      "$type": "app.bsky.richtext.facet#mention",
-                      "did": "user(0)",
-                    },
-                  ],
-                  "index": Object {
-                    "byteEnd": 18,
-                    "byteStart": 0,
-                  },
-                },
-              ],
-              "text": "@alice.bluesky.xyz is the best",
-            },
-          },
-        },
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(7)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(9)",
-            "val": "test-label",
-          },
-        ],
-        "likeCount": 2,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "embed": Object {
-            "$type": "app.bsky.embed.record",
-            "record": Object {
-              "cid": "cids(8)",
-              "uri": "record(10)",
-            },
-          },
-          "text": "yoohoo label_me",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(9)",
-        "viewer": Object {},
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
-          "did": "user(2)",
-          "displayName": "bobby",
-          "handle": "bob.test",
-          "labels": Array [],
-          "viewer": Object {
-            "blockedBy": false,
-            "followedBy": "record(5)",
-            "following": "record(4)",
-            "muted": false,
-          },
-        },
-        "cid": "cids(12)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000+00:00",
-          "text": "bobby boy here",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(14)",
-        "viewer": Object {},
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-          "did": "user(0)",
-          "displayName": "ali",
-          "handle": "alice.test",
-          "labels": Array [
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-a",
-            },
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-b",
-            },
-          ],
-          "viewer": Object {
-            "blockedBy": false,
-            "muted": false,
-          },
-        },
-        "cid": "cids(3)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 3,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000000Z",
-          "text": "again",
-        },
-        "replyCount": 2,
-        "repostCount": 1,
-        "uri": "record(2)",
-        "viewer": Object {},
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "did": "user(4)",
-          "handle": "carol.test",
-          "labels": Array [],
-          "viewer": Object {
-            "blockedBy": false,
-            "followedBy": "record(8)",
-            "following": "record(7)",
-            "muted": false,
-          },
-        },
-        "cid": "cids(9)",
-        "embed": Object {
-          "$type": "app.bsky.embed.recordWithMedia#view",
-          "media": Object {
-            "$type": "app.bsky.embed.images#view",
-            "images": Array [
-              Object {
-                "alt": "tests/sample-img/key-landscape-small.jpg",
-                "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(5)@jpeg",
-                "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(5)@jpeg",
-              },
-              Object {
-                "alt": "tests/sample-img/key-alt.jpg",
-                "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(10)@jpeg",
-                "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(10)@jpeg",
-              },
-            ],
-          },
-          "record": Object {
-            "record": Object {
-              "$type": "app.bsky.embed.record#viewRecord",
-              "author": Object {
-                "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
-                "did": "user(2)",
-                "displayName": "bobby",
-                "handle": "bob.test",
-                "labels": Array [],
-                "viewer": Object {
-                  "blockedBy": false,
-                  "followedBy": "record(5)",
-                  "following": "record(4)",
-                  "muted": false,
-                },
-              },
-              "cid": "cids(11)",
-              "embeds": Array [],
-              "indexedAt": "1970-01-01T00:00:00.000Z",
-              "labels": Array [],
-              "uri": "record(13)",
-              "value": Object {
-                "$type": "app.bsky.feed.post",
-                "createdAt": "1970-01-01T00:00:00.000Z",
-                "langs": Array [
-                  "en-US",
-                  "i-klingon",
-                ],
-                "text": "bob back at it again!",
-              },
-            },
-          },
-        },
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 2,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "embed": Object {
-            "$type": "app.bsky.embed.recordWithMedia",
-            "media": Object {
-              "$type": "app.bsky.embed.images",
-              "images": Array [
-                Object {
-                  "alt": "tests/sample-img/key-landscape-small.jpg",
-                  "image": Object {
-                    "$type": "blob",
-                    "mimeType": "image/jpeg",
-                    "ref": Object {
-                      "$link": "cids(5)",
-                    },
-                    "size": 4114,
-                  },
-                },
-                Object {
-                  "alt": "tests/sample-img/key-alt.jpg",
-                  "image": Object {
-                    "$type": "blob",
-                    "mimeType": "image/jpeg",
-                    "ref": Object {
-                      "$link": "cids(10)",
-                    },
-                    "size": 12736,
-                  },
-                },
-              ],
-            },
-            "record": Object {
-              "record": Object {
-                "cid": "cids(11)",
-                "uri": "record(13)",
-              },
-            },
-          },
-          "text": "hi im carol",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(12)",
-        "viewer": Object {
-          "like": "record(15)",
-        },
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
-          "did": "user(2)",
-          "displayName": "bobby",
-          "handle": "bob.test",
-          "labels": Array [],
-          "viewer": Object {
-            "blockedBy": false,
-            "followedBy": "record(5)",
-            "following": "record(4)",
-            "muted": false,
-          },
-        },
-        "cid": "cids(11)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "langs": Array [
-            "en-US",
-            "i-klingon",
-          ],
-          "text": "bob back at it again!",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(13)",
-        "viewer": Object {},
-      },
-    },
-    Object {
-      "post": Object {
-        "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-          "did": "user(0)",
-          "displayName": "ali",
-          "handle": "alice.test",
-          "labels": Array [
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-a",
-            },
-            Object {
-              "cid": "cids(2)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "user(0)",
-              "uri": "record(1)",
-              "val": "self-label-b",
-            },
-          ],
-          "viewer": Object {
-            "blockedBy": false,
-            "muted": false,
-          },
-        },
-        "cid": "cids(13)",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(13)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "user(0)",
-            "uri": "record(16)",
-            "val": "self-label",
-          },
-        ],
-        "likeCount": 0,
-        "record": Object {
-          "$type": "app.bsky.feed.post",
-          "createdAt": "1970-01-01T00:00:00.000Z",
-          "labels": Object {
-            "$type": "com.atproto.label.defs#selfLabels",
-            "values": Array [
-              Object {
-                "val": "self-label",
-              },
-            ],
-          },
-          "text": "hey there",
-        },
-        "replyCount": 0,
-        "repostCount": 0,
-        "uri": "record(16)",
-        "viewer": Object {},
-      },
-    },
-  ],
+  "feed": Array [],
 }
 `;
diff --git a/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap
index 7d7d4325dcf..a0a3b0c860c 100644
--- a/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap
@@ -303,24 +303,7 @@ Object {
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(0)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(0)",
-            "val": "test-label",
-          },
-          Object {
-            "cid": "cids(0)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(0)",
-            "val": "test-label-2",
-          },
-        ],
+        "labels": Array [],
         "likeCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -757,24 +740,7 @@ Object {
             ],
           },
           "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label",
-            },
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label-2",
-            },
-          ],
+          "labels": Array [],
           "likeCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
@@ -885,24 +851,7 @@ Object {
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label",
-          },
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label-2",
-          },
-        ],
+        "labels": Array [],
         "likeCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -1181,16 +1130,7 @@ Object {
           },
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(6)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(6)",
-            "val": "test-label",
-          },
-        ],
+        "labels": Array [],
         "likeCount": 2,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -1666,24 +1606,7 @@ Object {
             ],
           },
           "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label",
-            },
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label-2",
-            },
-          ],
+          "labels": Array [],
           "likeCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
@@ -2100,24 +2023,7 @@ Object {
             ],
           },
           "indexedAt": "1970-01-01T00:00:00.000Z",
-          "labels": Array [
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label",
-            },
-            Object {
-              "cid": "cids(4)",
-              "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
-              "src": "did:example:labeler",
-              "uri": "record(3)",
-              "val": "test-label-2",
-            },
-          ],
+          "labels": Array [],
           "likeCount": 0,
           "record": Object {
             "$type": "app.bsky.feed.post",
@@ -2356,24 +2262,7 @@ Object {
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label",
-          },
-          Object {
-            "cid": "cids(4)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(3)",
-            "val": "test-label-2",
-          },
-        ],
+        "labels": Array [],
         "likeCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -2652,16 +2541,7 @@ Object {
           },
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(11)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "did:example:labeler",
-            "uri": "record(13)",
-            "val": "test-label",
-          },
-        ],
+        "labels": Array [],
         "likeCount": 2,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -3519,48 +3399,6 @@ Object {
 
 exports[`proxies view requests unspecced.getPopularFeedGenerators 1`] = `
 Object {
-  "cursor": "0000000000000::bafycid",
-  "feeds": Array [
-    Object {
-      "cid": "cids(0)",
-      "creator": Object {
-        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
-        "description": "its me!",
-        "did": "user(0)",
-        "displayName": "ali",
-        "handle": "alice.test",
-        "indexedAt": "1970-01-01T00:00:00.000Z",
-        "labels": Array [
-          Object {
-            "cid": "cids(2)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "user(0)",
-            "uri": "record(1)",
-            "val": "self-label-a",
-          },
-          Object {
-            "cid": "cids(2)",
-            "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
-            "src": "user(0)",
-            "uri": "record(1)",
-            "val": "self-label-b",
-          },
-        ],
-        "viewer": Object {
-          "blockedBy": false,
-          "muted": false,
-        },
-      },
-      "description": "Provides all feed candidates",
-      "did": "did:example:feedgen",
-      "displayName": "All",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "likeCount": 0,
-      "uri": "record(0)",
-      "viewer": Object {},
-    },
-  ],
+  "feeds": Array [],
 }
 `;
diff --git a/packages/pds/tests/proxied/admin.test.ts b/packages/pds/tests/proxied/admin.test.ts
index fd8538e802a..c4d75ff8b2b 100644
--- a/packages/pds/tests/proxied/admin.test.ts
+++ b/packages/pds/tests/proxied/admin.test.ts
@@ -8,7 +8,8 @@ import {
 import { forSnapshot } from '../_util'
 import { NotFoundError } from '@atproto/api/src/client/types/app/bsky/feed/getPostThread'
 
-describe('proxies admin requests', () => {
+// @TODO skipping during appview v2 buildout, as appview frontends no longer contains moderation endpoints
+describe.skip('proxies admin requests', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
@@ -34,7 +35,7 @@ describe('proxies admin requests', () => {
       )
     await basicSeed(sc, {
       inviteCode: invite.code,
-      addModLabels: true,
+      addModLabels: network.bsky,
     })
     await network.processAll()
   })
diff --git a/packages/pds/tests/proxied/feedgen.test.ts b/packages/pds/tests/proxied/feedgen.test.ts
index 6f06ce0d020..32e03256a7c 100644
--- a/packages/pds/tests/proxied/feedgen.test.ts
+++ b/packages/pds/tests/proxied/feedgen.test.ts
@@ -1,4 +1,3 @@
-import { makeAlgos } from '@atproto/bsky'
 import AtpAgent, { AtUri, FeedNS } from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
@@ -19,11 +18,16 @@ describe('feedgen proxy view', () => {
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'proxy_feedgen',
-      bsky: { algos: makeAlgos(feedUri.host) },
+      bsky: {
+        // @TODO consider using makeAlgos() here if the appview begins supporting any feeds out of the box
+        algos: {
+          [feedUri.toString()]: async () => ({ feedItems: [] }),
+        },
+      },
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     // publish feed
     const feed = await agent.api.app.bsky.feed.generator.create(
       { repo: sc.dids.alice, rkey: feedUri.rkey },
diff --git a/packages/pds/tests/proxied/procedures.test.ts b/packages/pds/tests/proxied/procedures.test.ts
index 8c246e38da7..3aeb7d98d7e 100644
--- a/packages/pds/tests/proxied/procedures.test.ts
+++ b/packages/pds/tests/proxied/procedures.test.ts
@@ -17,7 +17,7 @@ describe('proxies appview procedures', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
diff --git a/packages/pds/tests/proxied/read-after-write.test.ts b/packages/pds/tests/proxied/read-after-write.test.ts
index 52507a2730a..df7629ee778 100644
--- a/packages/pds/tests/proxied/read-after-write.test.ts
+++ b/packages/pds/tests/proxied/read-after-write.test.ts
@@ -21,7 +21,7 @@ describe('proxy read after write', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     await network.processAll()
     alice = sc.dids.alice
     carol = sc.dids.carol
diff --git a/packages/pds/tests/proxied/views.test.ts b/packages/pds/tests/proxied/views.test.ts
index 94b76719d70..b0fd3e6e17a 100644
--- a/packages/pds/tests/proxied/views.test.ts
+++ b/packages/pds/tests/proxied/views.test.ts
@@ -19,7 +19,7 @@ describe('proxies view requests', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
@@ -79,7 +79,7 @@ describe('proxies view requests', () => {
       { did: sc.dids.carol, order: 2 },
       { did: sc.dids.dan, order: 3 },
     ]
-    await network.bsky.ctx.db
+    await network.bsky.db
       .getPrimary()
       .db.insertInto('suggested_follow')
       .values(suggestions)
diff --git a/packages/pds/tests/seeds/basic.ts b/packages/pds/tests/seeds/basic.ts
index 1085e2b381e..31195c5b9ba 100644
--- a/packages/pds/tests/seeds/basic.ts
+++ b/packages/pds/tests/seeds/basic.ts
@@ -1,10 +1,10 @@
-import { SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestBsky } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 import usersSeed from './users'
 
 export default async (
   sc: SeedClient,
-  opts?: { inviteCode?: string; addModLabels?: boolean },
+  opts?: { inviteCode?: string; addModLabels?: TestBsky },
 ) => {
   await usersSeed(sc, opts)
 
@@ -134,24 +134,7 @@ export default async (
   await sc.repost(dan, alicesReplyToBob.ref)
 
   if (opts?.addModLabels) {
-    await sc.agent.com.atproto.admin.emitModerationEvent(
-      {
-        event: {
-          createLabelVals: ['repo-action-label'],
-          negateLabelVals: [],
-          $type: 'com.atproto.admin.defs#modEventLabel',
-        },
-        subject: {
-          $type: 'com.atproto.admin.defs#repoRef',
-          did: dan,
-        },
-        createdBy: 'did:example:admin',
-      },
-      {
-        encoding: 'application/json',
-        headers: sc.adminAuthHeaders(),
-      },
-    )
+    await createLabel(opts.addModLabels, { did: dan, val: 'repo-action-label' })
   }
 
   return sc
@@ -169,3 +152,21 @@ export const replies = {
   bob: ['hear that label_me label_me_2'],
   carol: ['of course'],
 }
+
+const createLabel = async (
+  bsky: TestBsky,
+  opts: { did: string; val: string },
+) => {
+  await bsky.db
+    .getPrimary()
+    .db.insertInto('label')
+    .values({
+      uri: opts.did,
+      cid: '',
+      val: opts.val,
+      cts: new Date().toISOString(),
+      neg: false,
+      src: 'did:example:labeler',
+    })
+    .execute()
+}