diff --git a/.github/actions/build-lambda/action.yml b/.github/actions/build-lambda/action.yml
index 399c7ad39..a9727241c 100644
--- a/.github/actions/build-lambda/action.yml
+++ b/.github/actions/build-lambda/action.yml
@@ -27,7 +27,7 @@ runs:
   using: 'composite'
   steps:
     - name: Install pnpm & node
-      uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+      uses: ./.github/actions/install-pnpm-and-node
       with:
         scope: ${{ inputs['scope'] }}
     # Theres a really annoying bug in PNPM deploy command that will try and create a folder at /home/pruned which we are not allowed to do, 
@@ -73,14 +73,4 @@ runs:
         if [[ -z $s3Key ]]; then
             s3Key="${{ github.sha }}.zip"
         fi
-        aws s3 cp ~/${{ github.sha }}.zip s3://${{inputs.s3-bucket}}/${s3Key}
-    - uses: actions/upload-artifact@v4
-      if: inputs.s3-key == ''
-      with:
-        name: ${{inputs.scope}}
-        path: ~/${{ github.sha }}.zip
-    - uses: actions/upload-artifact@v4
-      if: inputs.s3-key != ''
-      with:
-        name: ${{ inputs.s3-key }}
-        path: ~/${{ github.sha }}.zip
\ No newline at end of file
+        aws s3 cp ~/${{ github.sha }}.zip s3://${{inputs.s3-bucket}}/${s3Key}
\ No newline at end of file
diff --git a/.github/actions/cdktf/action.yml b/.github/actions/cdktf/action.yml
index 52c6fb973..cb8f26342 100644
--- a/.github/actions/cdktf/action.yml
+++ b/.github/actions/cdktf/action.yml
@@ -48,7 +48,7 @@ runs:
           ${{ runner.os }}-tfenv-
 
     - name: Install pnpm & node
-      uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+      uses: ./.github/actions/install-pnpm-and-node
       with:
         scope: ${{ inputs['scope'] }}
 
diff --git a/.github/workflows/account-data-deleter.yml b/.github/workflows/account-data-deleter.yml
index 3a47e118e..5419edaaa 100644
--- a/.github/workflows/account-data-deleter.yml
+++ b/.github/workflows/account-data-deleter.yml
@@ -33,13 +33,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: account-data-deleter
+      scope: '@server/account-data-deleter'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: account-data-deleter-cdk
+      scope: '@infrastructure/account-data-deleter'
       stack-output-path: infrastructure/account-data-deleter/cdktf.out/stacks/account-data-deleter
     secrets: inherit
 
@@ -47,7 +47,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: account-data-deleter
+      scope: '@server/account-data-deleter'
       app-path: servers/account-data-deleter
       app-port: 4015
       sentry-project: account-data-deleter
@@ -59,7 +59,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: account-data-deleter-events
+      scope: '@lambda/account-data-deleter-events'
       sentry-project: account-data-deleter
       s3-bucket-pattern: pocket-accountdatadeleter-{0}-sqs-event-consumer
       codedeploy-app-name-pattern: AccountDataDeleter-{0}-Sqs-Event-Consumer-Lambda
@@ -71,7 +71,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: account-data-deleter-batch-delete
+      scope: '@lambda/account-data-deleter-batch-delete'
       sentry-project: account-data-deleter
       s3-bucket-pattern: pocket-accountdatadeleter-{0}-batchdeletelambda
       codedeploy-app-name-pattern: AccountDataDeleter-{0}-BatchDeleteLambda-Lambda
diff --git a/.github/workflows/account-delete-monitor.yml b/.github/workflows/account-delete-monitor.yml
index 75bfe9c57..1693c7202 100644
--- a/.github/workflows/account-delete-monitor.yml
+++ b/.github/workflows/account-delete-monitor.yml
@@ -28,13 +28,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: account-delete-monitor
+      scope: '@lambda/account-delete-monitor'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: account-delete-monitor-cdk
+      scope: '@infrastructure/account-delete-monitor'
       stack-output-path: infrastructure/account-delete-monitor/cdktf.out/stacks/account-delete-monitor
     secrets: inherit
 
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: account-delete-monitor
+      scope: '@lambda/account-delete-monitor'
       sentry-project: account-delete-monitor
       s3-bucket-pattern: pocket-accountdeletemonitor-{0}-eventtracker
       codedeploy-app-name-pattern: AccountDeleteMonitor-{0}-EventTracker-Lambda
diff --git a/.github/workflows/annotations-api.yml b/.github/workflows/annotations-api.yml
index 03dd554d7..cf9662ef8 100644
--- a/.github/workflows/annotations-api.yml
+++ b/.github/workflows/annotations-api.yml
@@ -32,7 +32,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: annotations-api
+      scope: '@server/annotations-api'
     secrets: inherit
 
   apollo:
@@ -43,14 +43,14 @@ jobs:
       schema-file-path: servers/annotations-api/dist/schema-generated.graphql
       prod-graph-url: https://annotations-api.readitlater.com
       dev-graph-url: https://annotations-api.getpocket.dev
-      scope: annotations-api
+      scope: '@server/annotations-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: annotations-api-cdk
+      scope: '@infrastructure/annotations-api'
       stack-output-path: infrastructure/annotations-api/cdktf.out/stacks/annotations-api
     secrets: inherit
 
@@ -58,7 +58,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: annotations-api
+      scope: '@server/annotations-api'
       app-path: servers/annotations-api
       app-port: 4008
       sentry-project: annotations-api
@@ -70,7 +70,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: annotations-api-events-lambda
+      scope: '@lambda/annotations-api-events'
       sentry-project: annotations-api
       s3-bucket-pattern: pocket-annotationsapi-{0}-sqs-event-consumer
       codedeploy-app-name-pattern: AnnotationsAPI-{0}-Sqs-Event-Consumer-Lambda
diff --git a/.github/workflows/braze-content-proxy.yml b/.github/workflows/braze-content-proxy.yml
index f44945b12..8f941c3f4 100644
--- a/.github/workflows/braze-content-proxy.yml
+++ b/.github/workflows/braze-content-proxy.yml
@@ -29,13 +29,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: braze-content-proxy
+      scope: '@server/braze-content-proxy'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: braze-content-proxy-cdk
+      scope: '@infrastructure/braze-content-proxy'
       stack-output-path: infrastructure/braze-content-proxy/cdktf.out/stacks/braze-content-proxy
     secrets: inherit
 
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: braze-content-proxy
+      scope: '@server/braze-content-proxy'
       app-path: servers/braze-content-proxy
       app-port: 4500
       sentry-project: braze-content-proxy
diff --git a/.github/workflows/braze.yml b/.github/workflows/braze.yml
index e14cf68fb..c5e67dbcf 100644
--- a/.github/workflows/braze.yml
+++ b/.github/workflows/braze.yml
@@ -25,6 +25,6 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: braze-cdk
+      scope: '@infrastructure/braze'
       stack-output-path: infrastructure/braze/cdktf.out/stacks/braze
     secrets: inherit
diff --git a/.github/workflows/client-api.yml b/.github/workflows/client-api.yml
index 81a755e9b..0e6cef2d6 100644
--- a/.github/workflows/client-api.yml
+++ b/.github/workflows/client-api.yml
@@ -27,7 +27,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: client-api-cdk
+      scope: '@infrastructure/client-api'
       stack-output-path: infrastructure/client-api/cdktf.out/stacks/client-api
     secrets: inherit
 
@@ -35,7 +35,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: client-api
+      scope: '@server/client-api'
       docker-repo-name-pattern: clientapi-{0}-app
       context: servers/client-api
       app-path: servers/client-api
diff --git a/.github/workflows/feature-flags.yml b/.github/workflows/feature-flags.yml
index e1ece80d5..34a323618 100644
--- a/.github/workflows/feature-flags.yml
+++ b/.github/workflows/feature-flags.yml
@@ -39,7 +39,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: feature-flags-cdk
+      scope: '@infrastructure/feature-flags'
       stack-output-path: infrastructure/feature-flags/cdktf.out/stacks/feature-flags
     secrets: inherit
 
@@ -47,7 +47,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: feature-flags
+      scope: '@server/feature-flags'
       app-path: servers/feature-flags
       app-port: 4242
       sentry-project: feature-flags
diff --git a/.github/workflows/fxa-webhook-proxy.yml b/.github/workflows/fxa-webhook-proxy.yml
index acfb0a33c..25d42aad1 100644
--- a/.github/workflows/fxa-webhook-proxy.yml
+++ b/.github/workflows/fxa-webhook-proxy.yml
@@ -29,7 +29,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: fxa-webhook-proxy-cdk
+      scope: '@infrastructure/fxa-webhook-proxy'
       stack-output-path: infrastructure/fxa-webhook-proxy/cdktf.out/stacks/fxa-webhook-proxy
     secrets: inherit
 
@@ -37,7 +37,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: fxa-webhook-proxy-sqs
+      scope: '@lambda/fxa-webhook-proxy-sqs'
       sentry-project: fxa-webhook-proxy
       s3-bucket-pattern: pocket-fxawebhookproxy-{0}-sqs-fxa-events
       codedeploy-app-name-pattern: FxAWebhookProxy-{0}-Sqs-FxA-Events-Lambda
@@ -49,7 +49,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: fxa-webhook-proxy-gateway
+      scope: '@lambda/fxa-webhook-proxy-gateway'
       sentry-project: fxa-webhook-proxy
       s3-bucket-pattern: pocket-fxawebhookproxy-{0}-apigateway-fxa-events
       codedeploy-app-name-pattern: FxAWebhookProxy-{0}-ApiGateway-FxA-Events-Lambda
diff --git a/.github/workflows/image-api.yml b/.github/workflows/image-api.yml
index f9b5c4b85..ee74d861e 100644
--- a/.github/workflows/image-api.yml
+++ b/.github/workflows/image-api.yml
@@ -29,7 +29,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: image-api
+      scope: '@server/image-api'
     secrets: inherit
 
   apollo:
@@ -57,7 +57,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: image-api-cdk
+      scope: '@infrastructure/image-api'
       stack-output-path: infrastructure/image-api/cdktf.out/stacks/image-api
     secrets: inherit
 
@@ -65,7 +65,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: image-api
+      scope: '@server/image-api'
       app-path: servers/image-api
       app-port: 4867
       sentry-project: image-api
diff --git a/.github/workflows/instant-sync-events.yml b/.github/workflows/instant-sync-events.yml
index fdd939484..7764b8e75 100644
--- a/.github/workflows/instant-sync-events.yml
+++ b/.github/workflows/instant-sync-events.yml
@@ -27,7 +27,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: instant-sync-events-cdk
+      scope: '@infrastructure/instant-sync-events'
       stack-output-path: infrastructure/instant-sync-events/cdktf.out/stacks/instant-sync-events
     secrets: inherit
 
@@ -35,7 +35,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: instant-sync-events
+      scope: '@lambda/instant-sync-events'
       sentry-project: instant-sync-events
       s3-bucket-pattern: pocket-instantsyncevents-{0}-eventtracker
       codedeploy-app-name-pattern: InstantSyncEvents-{0}-EventTracker-Lambda
@@ -48,6 +48,6 @@ jobs:
     uses: ./.github/workflows/reuse-sentry-release.yml
     needs: [lambda]
     with:
-      sentry-project: annotations-api
+      sentry-project: instant-sync-events
       sentry-environment: ${{ github.ref == 'refs/heads/main' && 'production' || 'development' }}
     secrets: inherit
diff --git a/.github/workflows/list-api.yml b/.github/workflows/list-api.yml
index af1454459..128597b9c 100644
--- a/.github/workflows/list-api.yml
+++ b/.github/workflows/list-api.yml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: list-api
+      scope: '@server/list-api'
     secrets: inherit
 
   apollo:
@@ -42,14 +42,14 @@ jobs:
       schema-file-path: servers/list-api/dist/schema-generated.graphql
       prod-graph-url: https://list-api.readitlater.com
       dev-graph-url: https://list-api.getpocket.dev
-      scope: list-api
+      scope: '@server/list-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: list-api-cdk
+      scope: '@infrastructure/list-api'
       stack-output-path: infrastructure/list-api/cdktf.out/stacks/list-api
     secrets: inherit
 
@@ -57,7 +57,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: list-api
+      scope: '@server/list-api'
       app-path: servers/list-api
       app-port: 4005
       sentry-project: list-api
diff --git a/.github/workflows/notes-api.yml b/.github/workflows/notes-api.yml
index c4f460ba7..7656bd69f 100644
--- a/.github/workflows/notes-api.yml
+++ b/.github/workflows/notes-api.yml
@@ -29,7 +29,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: notes-api
+      scope: '@server/notes-api'
     secrets: inherit
 
   apollo:
@@ -40,14 +40,14 @@ jobs:
       schema-file-path: servers/notes-api/dist/schema-generated.graphql
       prod-graph-url: https://notes.readitlater.com
       dev-graph-url: https://notes.getpocket.dev
-      scope: notes-api
+      scope: '@server/notes-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: notes-api-cdk
+      scope: '@infrastructure/notes-api'
       stack-output-path: infrastructure/notes-api/cdktf.out/stacks/notes-api
     secrets: inherit
 
@@ -55,7 +55,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: notes-api
+      scope: '@server/notes-api'
       app-path: servers/notes-api
       app-port: 4029
       sentry-project: notes-api
diff --git a/.github/workflows/otel-collector.yml b/.github/workflows/otel-collector.yml
index f2386de88..14f5614ae 100644
--- a/.github/workflows/otel-collector.yml
+++ b/.github/workflows/otel-collector.yml
@@ -25,7 +25,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: otel-collector-cdk
+      scope: '@infrastructure/otel-collector'
       stack-output-path: infrastructure/otel-collector/cdktf.out/stacks/otel-collector
     secrets: inherit
 
@@ -33,7 +33,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: otel-collector
+      scope: '@server/otel-collector'
       docker-repo-name-pattern: otelcollector-{0}-app
       context: servers/otel-collector
       app-path: servers/otel-collector
diff --git a/.github/workflows/parser-graphql-wrapper.yml b/.github/workflows/parser-graphql-wrapper.yml
index 19ffe942a..5f94374e4 100644
--- a/.github/workflows/parser-graphql-wrapper.yml
+++ b/.github/workflows/parser-graphql-wrapper.yml
@@ -29,7 +29,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: parser-graphql-wrapper
+      scope: '@server/parser-graphql-wrapper'
     secrets: inherit
 
   apollo:
@@ -57,7 +57,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: parser-graphql-wrapper-cdk
+      scope: '@infrastructure/parser-graphql-wrapper'
       stack-output-path: infrastructure/parser-graphql-wrapper/cdktf.out/stacks/parser-graphql-wrapper
     secrets: inherit
 
@@ -65,7 +65,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: parser-graphql-wrapper
+      scope: '@server/parser-graphql-wrapper'
       app-path: servers/parser-graphql-wrapper
       app-port: 4001
       sentry-project: parser-graphql-wrapper
diff --git a/.github/workflows/pocket-event-bridge.yml b/.github/workflows/pocket-event-bridge.yml
index 0815c9f1c..2adf41e1d 100644
--- a/.github/workflows/pocket-event-bridge.yml
+++ b/.github/workflows/pocket-event-bridge.yml
@@ -25,6 +25,6 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: pocket-event-bridge-cdk
+      scope: '@infrastructure/pocket-event-bridge'
       stack-output-path: infrastructure/pocket-event-bridge/cdktf.out/stacks/pocket-event-bridge
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c96cd412b..98b59f0cd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 2
 
       - name: Install pnpm & node
-        uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+        uses: ./.github/actions/install-pnpm-and-node
       
       # https://github.com/pnpm/pnpm/issues/3141#issuecomment-1305563972
       - name: Set publishing config
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d64aeb07a..01011828f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v4
       
       - name: Install pnpm & node
-        uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+        uses: ./.github/actions/install-pnpm-and-node
       
       - name: Check for mismatched dependencies
         run: pnpm run list-mismatches
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
     
       - name: Install pnpm & node
-        uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+        uses: ./.github/actions/install-pnpm-and-node
 
       - name: Lint code
         run: pnpm run lint
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
       
       - name: Install pnpm & node
-        uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+        uses: ./.github/actions/install-pnpm-and-node
       
       - name: Unit tests
         # Following uses a 2 concurrency because terraform modules seems to fail with an OOM error on CI if we do more.
diff --git a/.github/workflows/push-server.yml b/.github/workflows/push-server.yml
index 841287e7f..16f5d8446 100644
--- a/.github/workflows/push-server.yml
+++ b/.github/workflows/push-server.yml
@@ -29,13 +29,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: push-server
+      scope: '@server/push-server'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: push-server-cdk
+      scope: '@infrastructure/push-server'
       stack-output-path: infrastructure/push-server/cdktf.out/stacks/push-server
     secrets: inherit
 
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: push-server
+      scope: '@server/push-server'
       app-path: servers/push-server
       sentry-project: push-server
       docker-repo-name-pattern: push-{0}-app
diff --git a/.github/workflows/reuse-apollo-federation.yml b/.github/workflows/reuse-apollo-federation.yml
index 63d8f83eb..063c22988 100644
--- a/.github/workflows/reuse-apollo-federation.yml
+++ b/.github/workflows/reuse-apollo-federation.yml
@@ -56,7 +56,7 @@ jobs:
             fetch-depth: 0
         - name: Install pnpm & node
           if: ${{ inputs.scope != '' }}
-          uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+          uses: ./.github/actions/install-pnpm-and-node
           with:
             scope: ${{ inputs['scope'] }}
         - name: Build schema
diff --git a/.github/workflows/reuse-build-and-push-image.yml b/.github/workflows/reuse-build-and-push-image.yml
index c90deeef1..d5f598e20 100644
--- a/.github/workflows/reuse-build-and-push-image.yml
+++ b/.github/workflows/reuse-build-and-push-image.yml
@@ -75,7 +75,7 @@ jobs:
           with:
               name: ${{inputs.archive-download-name}}
         - name: Build Docker Image
-          uses: pocket/pocket-monorepo/.github/actions/containerize@main
+          uses: ./.github/actions/containerize
           with:
             docker-repo-name: "${{inputs.development-aws-registry }}/${{ format(inputs.docker-repo-name-pattern, 'dev') }}"
             app-path: ${{inputs.app-path}}
@@ -109,7 +109,7 @@ jobs:
             role-to-assume: arn:aws:iam::410318598490:role/PocketGHARole
         - name: Build and Push Development Docker Image
           id: dev-docker-build
-          uses: pocket/pocket-monorepo/.github/actions/containerize@main
+          uses: ./.github/actions/containerize
           with:
             docker-repo-name: "${{inputs.development-aws-registry }}/${{ format(inputs.docker-repo-name-pattern, 'dev') }}"
             app-path: ${{inputs.app-path}}
@@ -123,7 +123,7 @@ jobs:
             scope: ${{inputs.scope}}
             push: true
         - name: Code Deploy Docker Image
-          uses: pocket/pocket-monorepo/.github/actions/ecs-codedeploy@main
+          uses: ./.github/actions/ecs-codedeploy
           if: fromJSON(inputs.terraform-output).ecs-task-containerName.value != ''
           with:
             docker-image-name: ${{steps.dev-docker-build.outputs.docker-image-name}}
@@ -149,7 +149,7 @@ jobs:
             role-to-assume: arn:aws:iam::996905175585:role/PocketGHARole
         - name: Build and Push Production Docker Image
           id: prod-docker-build
-          uses: pocket/pocket-monorepo/.github/actions/containerize@main
+          uses: ./.github/actions/containerize
           with:
             docker-repo-name: "${{inputs.production-aws-registry }}/${{ format(inputs.docker-repo-name-pattern, 'prod') }}"
             app-path: ${{inputs.app-path}}
@@ -163,7 +163,7 @@ jobs:
             scope: ${{inputs.scope}}
             push: true
         - name: Code Deploy Docker Image
-          uses: pocket/pocket-monorepo/.github/actions/ecs-codedeploy@main
+          uses: ./.github/actions/ecs-codedeploy
           if: fromJSON(inputs.terraform-output).ecs-task-containerName.value != ''
           with:
             docker-image-name: ${{steps.prod-docker-build.outputs.docker-image-name}}
diff --git a/.github/workflows/reuse-build-and-push-lambda.yml b/.github/workflows/reuse-build-and-push-lambda.yml
index 8a3722cfb..6975f2bdf 100644
--- a/.github/workflows/reuse-build-and-push-lambda.yml
+++ b/.github/workflows/reuse-build-and-push-lambda.yml
@@ -52,7 +52,7 @@ jobs:
         - name: Checkout
           uses: actions/checkout@v4
         - name: Build Lambda
-          uses: pocket/pocket-monorepo/.github/actions/build-lambda@main
+          uses: ./.github/actions/build-lambda
           with:
             sentry-project: ${{inputs['sentry-project']}}
             sentry-org: ${{inputs['sentry-org']}}
@@ -72,7 +72,7 @@ jobs:
             aws-region: us-east-1
             role-to-assume: arn:aws:iam::410318598490:role/PocketGHARole
         - name: Build Lambda
-          uses: pocket/pocket-monorepo/.github/actions/build-lambda@main
+          uses: ./.github/actions/build-lambda
           with:
             sentry-project: ${{inputs['sentry-project']}}
             sentry-org: ${{inputs['sentry-org']}}
@@ -81,7 +81,7 @@ jobs:
             s3-bucket: ${{ format(inputs.s3-bucket-pattern, 'dev') }}
             s3-key: ${{ inputs.s3-key }}
         - name: CodeDeploy Lambda
-          uses: pocket/pocket-monorepo/.github/actions/lambda-codedeploy@main
+          uses: ./.github/actions/lambda-codedeploy
           with:
             s3-bucket: ${{ format(inputs.s3-bucket-pattern, 'dev') }}
             s3-key: ${{ inputs.s3-key }}
@@ -101,7 +101,7 @@ jobs:
             aws-region: us-east-1
             role-to-assume: arn:aws:iam::996905175585:role/PocketGHARole
         - name: Build Lambda
-          uses: pocket/pocket-monorepo/.github/actions/build-lambda@main
+          uses: ./.github/actions/build-lambda
           with:
             sentry-project: ${{inputs['sentry-project']}}
             sentry-org: ${{inputs['sentry-org']}}
@@ -110,7 +110,7 @@ jobs:
             s3-bucket: ${{ format(inputs.s3-bucket-pattern, 'prod') }}
             s3-key: ${{ inputs.s3-key }}
         - name: CodeDeploy Lambda
-          uses: pocket/pocket-monorepo/.github/actions/lambda-codedeploy@main
+          uses: ./.github/actions/lambda-codedeploy
           with:
             s3-bucket: ${{ format(inputs.s3-bucket-pattern, 'prod') }}
             s3-key: ${{ inputs.s3-key }}
diff --git a/.github/workflows/reuse-infrastructure.yml b/.github/workflows/reuse-infrastructure.yml
index 8c3948417..847dc2fbe 100644
--- a/.github/workflows/reuse-infrastructure.yml
+++ b/.github/workflows/reuse-infrastructure.yml
@@ -34,8 +34,6 @@ jobs:
       steps:
         - name: Checkout
           uses: actions/checkout@v4
-        - name: Checkout Actions
-          uses: actions/checkout@v4
         # Get the AWS credentials
         - name: AWS Credentials
           uses: aws-actions/configure-aws-credentials@v4
@@ -44,7 +42,7 @@ jobs:
             role-to-assume: arn:aws:iam::996905175585:role/PocketGHARole
         - name: Execute CDKTF
           if: inputs.raw-terraform == false
-          uses: pocket/pocket-monorepo/.github/actions/cdktf@main
+          uses: ./.github/actions/cdktf
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
@@ -56,7 +54,7 @@ jobs:
 
         - name: Execute Raw Terraform
           if: inputs.raw-terraform == true
-          uses: pocket/pocket-monorepo/.github/actions/raw-terraform@main
+          uses: ./.github/actions/raw-terraform
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
@@ -88,7 +86,7 @@ jobs:
             role-to-assume: arn:aws:iam::996905175585:role/PocketGHARole
         - name: Execute Development CDKTF
           if: inputs.raw-terraform == false && github.ref == 'refs/heads/dev'
-          uses: pocket/pocket-monorepo/.github/actions/cdktf@main
+          uses: ./.github/actions/cdktf
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
@@ -99,7 +97,7 @@ jobs:
             terraform-token: ${{ secrets.TERRAFORM_TOKEN }}
         - name: Execute Developement Raw Terraform
           if: inputs.raw-terraform == true && github.ref == 'refs/heads/dev'
-          uses: pocket/pocket-monorepo/.github/actions/raw-terraform@main
+          uses: ./.github/actions/raw-terraform
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
@@ -111,7 +109,7 @@ jobs:
 
         - name: Execute Production CDKTF
           if: inputs.raw-terraform == false && github.ref == 'refs/heads/main'
-          uses: pocket/pocket-monorepo/.github/actions/cdktf@main
+          uses: ./.github/actions/cdktf
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
@@ -123,7 +121,7 @@ jobs:
 
         - name: Execute Production Raw Terraform
           if: inputs.raw-terraform == true && github.ref == 'refs/heads/main'
-          uses: pocket/pocket-monorepo/.github/actions/raw-terraform@main
+          uses: ./.github/actions/raw-terraform
           with:
             stack-output-path: ${{inputs['stack-output-path']}}
             scope: ${{inputs['scope']}}
diff --git a/.github/workflows/reuse-test-integrations.yml b/.github/workflows/reuse-test-integrations.yml
index 1e5090dd7..3bf9834ef 100644
--- a/.github/workflows/reuse-test-integrations.yml
+++ b/.github/workflows/reuse-test-integrations.yml
@@ -29,7 +29,7 @@ jobs:
     
     # While we wait for docker compose to be healthy we install node and needed packages for this service
     - name: Install pnpm & node
-      uses: pocket/pocket-monorepo/.github/actions/install-pnpm-and-node@main
+      uses: ./.github/actions/install-pnpm-and-node
       with:
         scope: ${{ inputs['scope'] }}
     
diff --git a/.github/workflows/sendgrid-data.yml b/.github/workflows/sendgrid-data.yml
index ecd471529..65bba8d5d 100644
--- a/.github/workflows/sendgrid-data.yml
+++ b/.github/workflows/sendgrid-data.yml
@@ -27,7 +27,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: sendgrid-data-cdk
+      scope: '@infrastructure/sendgrid-data'
       stack-output-path: infrastructure/sendgrid-data/cdktf.out/stacks/sendgrid-data
     secrets: inherit
 
@@ -36,7 +36,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: sendgrid-data
+      scope: '@lambda/sendgrid-data'
       sentry-project: sendgrid-data
       s3-bucket-pattern: pocket-sendgriddata-{0}-apigateway
       codedeploy-app-name-pattern: SendGridData-{0}-ApiGateway-Lambda
diff --git a/.github/workflows/shareable-lists-api.yml b/.github/workflows/shareable-lists-api.yml
index 3ade55356..027149857 100644
--- a/.github/workflows/shareable-lists-api.yml
+++ b/.github/workflows/shareable-lists-api.yml
@@ -29,7 +29,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: shareable-lists-api
+      scope: '@server/shareable-lists-api'
     secrets: inherit
 
   apollo:
@@ -40,7 +40,7 @@ jobs:
       schema-file-path: servers/shareable-lists-api/schema-client-api.graphql
       prod-graph-url: https://shareablelistsapi.readitlater.com
       dev-graph-url: https://shareablelistsapi.getpocket.dev
-      scope: shareable-lists-api
+      scope: '@server/shareable-lists-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
@@ -52,7 +52,7 @@ jobs:
       schema-file-path: servers/shareable-lists-api/schema-admin-api.graphql
       prod-graph-url: https://shareablelistsapi.readitlater.com/admin
       dev-graph-url: https://shareablelistsapi.getpocket.dev/admin
-      scope: shareable-lists-api
+      scope: '@server/shareable-lists-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_ADMIN_API_KEY }}
 
@@ -60,7 +60,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: shareable-lists-api-cdk
+      scope: '@infrastructure/shareable-lists-api'
       stack-output-path: infrastructure/shareable-lists-api/cdktf.out/stacks/shareable-lists-api
     secrets: inherit
 
@@ -68,7 +68,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: shareable-lists-api
+      scope: '@server/shareable-lists-api'
       app-path: servers/shareable-lists-api
       app-port: 4029
       sentry-project: shareable-lists-api
@@ -80,7 +80,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: shareable-lists-api-events-lambda
+      scope: '@lambda/shareable-lists-api-events'
       sentry-project: shareable-lists-api
       s3-bucket-pattern: pocket-shareablelistsapi-{0}-sqs-event-consumer
       codedeploy-app-name-pattern: ShareableListsApi-{0}-Sqs-Event-Consumer-Lambda
diff --git a/.github/workflows/shared-snowplow-consumer.yml b/.github/workflows/shared-snowplow-consumer.yml
index 51d34206b..96463173c 100644
--- a/.github/workflows/shared-snowplow-consumer.yml
+++ b/.github/workflows/shared-snowplow-consumer.yml
@@ -30,13 +30,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: shared-snowplow-consumer
+      scope: '@server/shared-snowplow-consumer'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: shared-snowplow-consumer-cdk
+      scope: '@infrastructure/shared-snowplow-consumer'
       stack-output-path: infrastructure/shared-snowplow-consumer/cdktf.out/stacks/shared-snowplow-consumer
     secrets: inherit
 
@@ -44,7 +44,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: shared-snowplow-consumer
+      scope: '@server/shared-snowplow-consumer'
       app-path: servers/shared-snowplow-consumer
       app-port: 4015
       sentry-project: shared-snowplow-consumer
diff --git a/.github/workflows/shares-api.yml b/.github/workflows/shares-api.yml
index 086c866fe..5a66c17ca 100644
--- a/.github/workflows/shares-api.yml
+++ b/.github/workflows/shares-api.yml
@@ -30,7 +30,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: shares-api
+      scope: '@server/shares-api'
     secrets: inherit
 
   apollo:
@@ -41,14 +41,14 @@ jobs:
       schema-file-path: servers/shares-api/dist/schema-generated.graphql
       prod-graph-url: https://shares-api.readitlater.com
       dev-graph-url: https://shares-api.getpocket.dev
-      scope: shares-api
+      scope: '@server/shares-api'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: shares-api-cdk
+      scope: '@infrastructure/shares-api'
       stack-output-path: infrastructure/shares-api/cdktf.out/stacks/shares-api
     secrets: inherit
 
@@ -56,7 +56,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: shares-api
+      scope: '@server/shares-api'
       app-path: servers/shares-api
       app-port: 4031
       sentry-project: shares-api
diff --git a/.github/workflows/transactional-emails.yml b/.github/workflows/transactional-emails.yml
index eec2a07d1..b23d8b251 100644
--- a/.github/workflows/transactional-emails.yml
+++ b/.github/workflows/transactional-emails.yml
@@ -27,7 +27,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: transactional-emails-cdk
+      scope: '@infrastructure/transactional-emails'
       stack-output-path: infrastructure/transactional-emails/cdktf.out/stacks/transactional-emails
     secrets: inherit
 
@@ -35,7 +35,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: transactional-emails
+      scope: '@lambda/transactional-emails'
       sentry-project: transactional-emails
       s3-bucket-pattern: pocket-transactionalemails-{0}-sqs-event-consumer
       codedeploy-app-name-pattern: TransactionalEmails-{0}-Sqs-Event-Consumer-Lambda
diff --git a/.github/workflows/user-api.yml b/.github/workflows/user-api.yml
index 70a41d266..7b01604e6 100644
--- a/.github/workflows/user-api.yml
+++ b/.github/workflows/user-api.yml
@@ -34,7 +34,7 @@ jobs:
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
       # Only run the tests for our service
-      scope: user-api
+      scope: '@server/user-api'
     # Ensure the re-usable workflow is allowed to access the secrets
     secrets: inherit
 
@@ -53,7 +53,7 @@ jobs:
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: user-api-cdk
+      scope: '@infrastructure/user-api'
       stack-output-path: infrastructure/user-api/cdktf.out/stacks/user-api
     # Ensure the re-usable workflow is allowed to access the secrets
     secrets: inherit
@@ -63,7 +63,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: user-api
+      scope: '@server/user-api'
       app-path: servers/user-api
       app-port: 4006
       sentry-project: user-api
diff --git a/.github/workflows/user-list-search.yml b/.github/workflows/user-list-search.yml
index 7183b1bf0..ca1802748 100644
--- a/.github/workflows/user-list-search.yml
+++ b/.github/workflows/user-list-search.yml
@@ -31,7 +31,7 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: user-list-search
+      scope: '@server/user-list-search'
     secrets: inherit
 
   apollo:
@@ -42,7 +42,7 @@ jobs:
       schema-file-path: servers/user-list-search/dist/schema-generated.graphql
       prod-graph-url: https://user-list-search.readitlater.com/graphql
       dev-graph-url: https://user-list-search.getpocket.dev/graphql
-      scope: user-list-search
+      scope: '@server/user-list-search'
     secrets:
       apollo-key: ${{ secrets.APOLLO_CLIENT_API_KEY }}
 
@@ -51,14 +51,14 @@ jobs:
     with:
       raw-terraform: true
       stack-output-path: infrastructure/user-list-search
-      scope: user-list-search
+      scope: '@infrastructure/user-list-search'
     secrets: inherit
 
   api:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search
+      scope: '@server/user-list-search'
       app-path: servers/user-list-search
       app-port: 4000
       sentry-project: user-list-search
@@ -70,7 +70,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-events
+      scope: '@lambda/user-list-search-events'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: events-${{ github.sha }}.zip
@@ -83,7 +83,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-kinesis-to-sqs
+      scope: '@lambda/user-list-search-kinesis-to-sqs'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: kinesis-${{ github.sha }}.zip
@@ -96,7 +96,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-indexing
+      scope: '@lambda/user-list-search-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: item-update-${{ github.sha }}.zip
@@ -109,7 +109,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-indexing
+      scope: '@lambda/user-list-search-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: item-delete-${{ github.sha }}.zip
@@ -122,7 +122,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-indexing
+      scope: '@lambda/user-list-search-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: item-update-backfill-${{ github.sha }}.zip
@@ -135,7 +135,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-indexing
+      scope: '@lambda/user-list-search-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: user-list-import-${{ github.sha }}.zip
@@ -148,7 +148,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-indexing
+      scope: '@lambda/user-list-search-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: user-list-import-backfill-${{ github.sha }}.zip
@@ -161,7 +161,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-corpus-indexing
+      scope: '@lambda/user-list-search-corpus-indexing'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: corpus-indexing-${{ github.sha }}.zip
@@ -174,7 +174,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-lambda.yml
     needs: [infrastructure]
     with:
-      scope: user-list-search-corpus-parser-hydration
+      scope: '@lambda/user-list-search-corpus-parser-hydration'
       sentry-project: user-list-search
       s3-bucket-pattern: pocket-userlistsearch-{0}-kinesis-consumer
       s3-key: corpus-parser-hydration-${{ github.sha }}.zip
diff --git a/.github/workflows/v3-proxy-api.yml b/.github/workflows/v3-proxy-api.yml
index 2dff82145..4bb59d4ac 100644
--- a/.github/workflows/v3-proxy-api.yml
+++ b/.github/workflows/v3-proxy-api.yml
@@ -29,13 +29,13 @@ jobs:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/reuse-test-integrations.yml
     with:
-      scope: v3-proxy-api
+      scope: '@server/v3-proxy-api'
     secrets: inherit
 
   infrastructure:
     uses: ./.github/workflows/reuse-infrastructure.yml
     with:
-      scope: v3-proxy-api-cdk
+      scope: '@infrastructure/v3-proxy-api'
       stack-output-path: infrastructure/v3-proxy-api/cdktf.out/stacks/v3-proxy-api
     secrets: inherit
 
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/reuse-build-and-push-image.yml
     needs: [infrastructure]
     with:
-      scope: v3-proxy-api
+      scope: '@server/v3-proxy-api'
       app-path: servers/v3-proxy-api
       app-port: 4030
       sentry-project: v3-proxy-api
diff --git a/infrastructure/account-data-deleter/package.json b/infrastructure/account-data-deleter/package.json
index 455621a37..f244428f4 100644
--- a/infrastructure/account-data-deleter/package.json
+++ b/infrastructure/account-data-deleter/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-data-deleter-cdk",
+  "name": "@infrastructure/account-data-deleter",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/account-delete-monitor/package.json b/infrastructure/account-delete-monitor/package.json
index c6b8614d3..7910f9c66 100644
--- a/infrastructure/account-delete-monitor/package.json
+++ b/infrastructure/account-delete-monitor/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-delete-monitor-cdk",
+  "name": "@infrastructure/account-delete-monitor",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/annotations-api/package.json b/infrastructure/annotations-api/package.json
index 5c12b728b..b72e7fa88 100644
--- a/infrastructure/annotations-api/package.json
+++ b/infrastructure/annotations-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "annotations-api-cdk",
+  "name": "@infrastructure/annotations-api",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/braze-content-proxy/package.json b/infrastructure/braze-content-proxy/package.json
index 32410004e..b0695a167 100644
--- a/infrastructure/braze-content-proxy/package.json
+++ b/infrastructure/braze-content-proxy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "braze-content-proxy-cdk",
+  "name": "@infrastructure/braze-content-proxy",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/braze/package.json b/infrastructure/braze/package.json
index 4a982ac37..4e4281d3d 100644
--- a/infrastructure/braze/package.json
+++ b/infrastructure/braze/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "braze-cdk",
+  "name": "@infrastructure/braze",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/client-api/package.json b/infrastructure/client-api/package.json
index 3222b7529..38887513c 100644
--- a/infrastructure/client-api/package.json
+++ b/infrastructure/client-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "client-api-cdk",
+  "name": "@infrastructure/client-api",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/feature-flags/package.json b/infrastructure/feature-flags/package.json
index a44804e6e..c4a285f7f 100644
--- a/infrastructure/feature-flags/package.json
+++ b/infrastructure/feature-flags/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "feature-flags-cdk",
+  "name": "@infrastructure/feature-flags",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/fxa-webhook-proxy/package.json b/infrastructure/fxa-webhook-proxy/package.json
index 003be1911..2111a280f 100644
--- a/infrastructure/fxa-webhook-proxy/package.json
+++ b/infrastructure/fxa-webhook-proxy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fxa-webhook-proxy-cdk",
+  "name": "@infrastructure/fxa-webhook-proxy",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/image-api/package.json b/infrastructure/image-api/package.json
index 6fbc7a9cc..72e9a7d83 100644
--- a/infrastructure/image-api/package.json
+++ b/infrastructure/image-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "image-api-cdk",
+  "name": "@infrastructure/image-api",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/instant-sync-events/package.json b/infrastructure/instant-sync-events/package.json
index fe5f1abdc..3a946b454 100644
--- a/infrastructure/instant-sync-events/package.json
+++ b/infrastructure/instant-sync-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "instant-sync-events-cdk",
+  "name": "@infrastructure/instant-sync-events",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/list-api/package.json b/infrastructure/list-api/package.json
index 4355e79a1..b95c29e57 100644
--- a/infrastructure/list-api/package.json
+++ b/infrastructure/list-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "list-api-cdk",
+  "name": "@infrastructure/list-api",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/notes-api/package.json b/infrastructure/notes-api/package.json
index 0c0eb2550..72ff1d33b 100644
--- a/infrastructure/notes-api/package.json
+++ b/infrastructure/notes-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "notes-api-cdk",
+  "name": "@infrastructure/notes-api",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/otel-collector/package.json b/infrastructure/otel-collector/package.json
index 62f892264..2144a3833 100644
--- a/infrastructure/otel-collector/package.json
+++ b/infrastructure/otel-collector/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "otel-collector-cdk",
+  "name": "@infrastructure/otel-collector",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/parser-graphql-wrapper/package.json b/infrastructure/parser-graphql-wrapper/package.json
index 3cb439b68..3bea02e13 100644
--- a/infrastructure/parser-graphql-wrapper/package.json
+++ b/infrastructure/parser-graphql-wrapper/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "parser-graphql-wrapper-cdk",
+  "name": "@infrastructure/parser-graphql-wrapper",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/pocket-event-bridge/package.json b/infrastructure/pocket-event-bridge/package.json
index 024ed5315..e148634e2 100644
--- a/infrastructure/pocket-event-bridge/package.json
+++ b/infrastructure/pocket-event-bridge/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "pocket-event-bridge-cdk",
+  "name": "@infrastructure/pocket-event-bridge",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/push-server/package.json b/infrastructure/push-server/package.json
index 56919e6fa..8601030c4 100644
--- a/infrastructure/push-server/package.json
+++ b/infrastructure/push-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "push-server-cdk",
+  "name": "@infrastructure/push-server",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/sendgrid-data/package.json b/infrastructure/sendgrid-data/package.json
index 4f8434435..838a23394 100644
--- a/infrastructure/sendgrid-data/package.json
+++ b/infrastructure/sendgrid-data/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "sendgrid-data-cdk",
+  "name": "@infrastructure/sendgrid-data",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/shareable-lists-api/package.json b/infrastructure/shareable-lists-api/package.json
index eb8862413..0f1f1f211 100644
--- a/infrastructure/shareable-lists-api/package.json
+++ b/infrastructure/shareable-lists-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shareable-lists-api-cdk",
+  "name": "@infrastructure/shareable-lists-api",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/shared-snowplow-consumer/package.json b/infrastructure/shared-snowplow-consumer/package.json
index 4aef49030..8160a8e3b 100644
--- a/infrastructure/shared-snowplow-consumer/package.json
+++ b/infrastructure/shared-snowplow-consumer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shared-snowplow-consumer-cdk",
+  "name": "@infrastructure/shared-snowplow-consumer",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/shares-api/package.json b/infrastructure/shares-api/package.json
index 59f4fbb34..6ad7fcc38 100644
--- a/infrastructure/shares-api/package.json
+++ b/infrastructure/shares-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shares-api-cdk",
+  "name": "@infrastructure/shares-api",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/transactional-emails/package.json b/infrastructure/transactional-emails/package.json
index 8b7f46b06..b97d6669a 100644
--- a/infrastructure/transactional-emails/package.json
+++ b/infrastructure/transactional-emails/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "transactional-emails-cdk",
+  "name": "@infrastructure/transactional-emails",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/infrastructure/user-api/package.json b/infrastructure/user-api/package.json
index 71e5fce90..452bf6c4c 100644
--- a/infrastructure/user-api/package.json
+++ b/infrastructure/user-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-api-cdk",
+  "name": "@infrastructure/user-api",
   "version": "1.0.0",
   "private": true,
   "type": "module",
diff --git a/infrastructure/v3-proxy-api/package.json b/infrastructure/v3-proxy-api/package.json
index f50461a03..21a1ce4f3 100644
--- a/infrastructure/v3-proxy-api/package.json
+++ b/infrastructure/v3-proxy-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "v3-proxy-api-cdk",
+  "name": "@infrastructure/v3-proxy-api",
   "version": "1.0.0",
   "private": true,
   "license": "MPL-2.0",
diff --git a/lambdas/account-data-deleter-batch-delete/package.json b/lambdas/account-data-deleter-batch-delete/package.json
index a2f852228..bb9282e23 100644
--- a/lambdas/account-data-deleter-batch-delete/package.json
+++ b/lambdas/account-data-deleter-batch-delete/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-data-deleter-batch-delete",
+  "name": "@lambda/account-data-deleter-batch-delete",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/account-data-deleter-events/package.json b/lambdas/account-data-deleter-events/package.json
index 0f4b7f7bc..3972e6798 100644
--- a/lambdas/account-data-deleter-events/package.json
+++ b/lambdas/account-data-deleter-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-data-deleter-events",
+  "name": "@lambda/account-data-deleter-events",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/account-delete-monitor/package.json b/lambdas/account-delete-monitor/package.json
index 743d438a0..6ba4df67b 100644
--- a/lambdas/account-delete-monitor/package.json
+++ b/lambdas/account-delete-monitor/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-delete-monitor",
+  "name": "@lambda/account-delete-monitor",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/annotations-api-events/package.json b/lambdas/annotations-api-events/package.json
index f94f72784..0cb7f3799 100644
--- a/lambdas/annotations-api-events/package.json
+++ b/lambdas/annotations-api-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "annotations-api-events-lambda",
+  "name": "@lambda/annotations-api-events",
   "version": "1.0.1",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/fxa-webook-proxy-gateway/package.json b/lambdas/fxa-webook-proxy-gateway/package.json
index ac1d768e9..e1fe57e05 100644
--- a/lambdas/fxa-webook-proxy-gateway/package.json
+++ b/lambdas/fxa-webook-proxy-gateway/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fxa-webhook-proxy-gateway",
+  "name": "@lambda/fxa-webhook-proxy-gateway",
   "version": "1.0.0",
   "description": "",
   "keywords": [],
diff --git a/lambdas/fxa-webook-proxy-sqs/package.json b/lambdas/fxa-webook-proxy-sqs/package.json
index ec8aeeb4b..4f564bb70 100644
--- a/lambdas/fxa-webook-proxy-sqs/package.json
+++ b/lambdas/fxa-webook-proxy-sqs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "fxa-webhook-proxy-sqs",
+  "name": "@lambda/fxa-webhook-proxy-sqs",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/instant-sync-events/package.json b/lambdas/instant-sync-events/package.json
index e6addbcf2..c7e210198 100644
--- a/lambdas/instant-sync-events/package.json
+++ b/lambdas/instant-sync-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "instant-sync-events",
+  "name": "@lambda/instant-sync-events",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/lambdas/sendgrid-data/package.json b/lambdas/sendgrid-data/package.json
index f867e6ce8..db7ad6e96 100644
--- a/lambdas/sendgrid-data/package.json
+++ b/lambdas/sendgrid-data/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "sendgrid-data",
+  "name": "@lambda/sendgrid-data",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/lambdas/shareable-lists-api-events/package.json b/lambdas/shareable-lists-api-events/package.json
index 89216d2bf..22328dfa9 100644
--- a/lambdas/shareable-lists-api-events/package.json
+++ b/lambdas/shareable-lists-api-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shareable-lists-api-events-lambda",
+  "name": "@lambda/shareable-lists-api-events",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/transactional-emails/package.json b/lambdas/transactional-emails/package.json
index 941831d36..8c2c20880 100644
--- a/lambdas/transactional-emails/package.json
+++ b/lambdas/transactional-emails/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "transactional-emails",
+  "name": "@lambda/transactional-emails",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/user-list-search-corpus-indexing/package.json b/lambdas/user-list-search-corpus-indexing/package.json
index 1714b21b8..b113250f6 100644
--- a/lambdas/user-list-search-corpus-indexing/package.json
+++ b/lambdas/user-list-search-corpus-indexing/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search-corpus-indexing",
+  "name": "@lambda/user-list-search-corpus-indexing",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/user-list-search-corpus-parser-hydration/package.json b/lambdas/user-list-search-corpus-parser-hydration/package.json
index c79040b03..7d6bab125 100644
--- a/lambdas/user-list-search-corpus-parser-hydration/package.json
+++ b/lambdas/user-list-search-corpus-parser-hydration/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search-corpus-parser-hydration",
+  "name": "@lambda/user-list-search-corpus-parser-hydration",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/lambdas/user-list-search-events/package.json b/lambdas/user-list-search-events/package.json
index c965bab33..5854fbf79 100644
--- a/lambdas/user-list-search-events/package.json
+++ b/lambdas/user-list-search-events/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search-events",
+  "name": "@lambda/user-list-search-events",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/lambdas/user-list-search-indexing/package.json b/lambdas/user-list-search-indexing/package.json
index 1bce8345b..140cee74d 100644
--- a/lambdas/user-list-search-indexing/package.json
+++ b/lambdas/user-list-search-indexing/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search-indexing",
+  "name": "@lambda/user-list-search-indexing",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/lambdas/user-list-search-kinesis-to-sqs/package.json b/lambdas/user-list-search-kinesis-to-sqs/package.json
index 1d6d0c67a..420f40966 100644
--- a/lambdas/user-list-search-kinesis-to-sqs/package.json
+++ b/lambdas/user-list-search-kinesis-to-sqs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search-kinesis-to-sqs",
+  "name": "@lambda/user-list-search-kinesis-to-sqs",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 139edb779..8dbf00855 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4030,7 +4030,7 @@ importers:
         version: link:../../packages/eslint-config
       '@snowplow/snowtype':
         specifier: ^0.10.1
-        version: 0.10.2(commander@12.1.0)(encoding@0.1.13)
+        version: 0.10.2(commander@12.1.0)
       '@types/jest':
         specifier: 29.5.14
         version: 29.5.14
@@ -7893,18 +7893,12 @@ packages:
   '@types/express-serve-static-core@4.19.6':
     resolution: {integrity: sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==}
 
-  '@types/express-serve-static-core@5.0.3':
-    resolution: {integrity: sha512-JEhMNwUJt7bw728CydvYzntD0XJeTmDnvwLlbfbAhE7Tbslm/ax6bdIiUwTgeVlZTsJQPwZwKpAkyDtIjsvx3g==}
-
   '@types/express-session@1.18.0':
     resolution: {integrity: sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==}
 
   '@types/express@4.17.21':
     resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
 
-  '@types/express@5.0.0':
-    resolution: {integrity: sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==}
-
   '@types/graceful-fs@4.1.9':
     resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
 
@@ -9220,9 +9214,6 @@ packages:
   cross-fetch@4.0.0:
     resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==}
 
-  cross-fetch@4.1.0:
-    resolution: {integrity: sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==}
-
   cross-inspect@1.0.1:
     resolution: {integrity: sha512-Pcw1JTvZLSJH83iiGWt6fRcT+BjZlCDRVwYLbUcHzv/CRpB7r0MlSrGbIyQvVSNyGnbt7G4AXuyCiDR3POvZ1A==}
     engines: {node: '>=16.0.0'}
@@ -9514,10 +9505,6 @@ packages:
     resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
     engines: {node: '>=12'}
 
-  dotenv@16.4.7:
-    resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
-    engines: {node: '>=12'}
-
   dotenv@5.0.1:
     resolution: {integrity: sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==}
     engines: {node: '>=4.6.0'}
@@ -9916,8 +9903,8 @@ packages:
   fast-fifo@1.3.2:
     resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
 
-  fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
     engines: {node: '>=8.6.0'}
 
   fast-json-patch@3.1.1:
@@ -10764,10 +10751,6 @@ packages:
     resolution: {integrity: sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==}
     engines: {node: '>=12.22.0'}
 
-  ioredis@5.4.2:
-    resolution: {integrity: sha512-0SZXGNGZ+WzISQ67QDyZ2x0+wVxjjUndtD8oSeik/4ajifeiRufed8fCb8QW8VMyi4MXcS+UO1k/0NGhvq1PAg==}
-    engines: {node: '>=12.22.0'}
-
   ip-address@9.0.5:
     resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
     engines: {node: '>= 12'}
@@ -12986,10 +12969,6 @@ packages:
     resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
 
-  qs@6.13.1:
-    resolution: {integrity: sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==}
-    engines: {node: '>=0.6'}
-
   querystring@0.2.0:
     resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
     engines: {node: '>=0.4.x'}
@@ -14848,7 +14827,7 @@ snapshots:
   '@apollo/utils.keyvadapter@3.1.0':
     dependencies:
       '@apollo/utils.keyvaluecache': 3.1.0
-      dataloader: 2.2.3
+      dataloader: 2.2.2
       keyv: 4.5.4
 
   '@apollo/utils.keyvaluecache@2.1.1':
@@ -15114,7 +15093,7 @@ snapshots:
       '@smithy/util-middleware': 3.0.11
       '@smithy/util-retry': 3.0.11
       '@smithy/util-utf8': 3.0.0
-      tslib: 2.8.1
+      tslib: 2.8.0
     transitivePeerDependencies:
       - aws-crt
 
@@ -15876,7 +15855,7 @@ snapshots:
       '@smithy/protocol-http': 4.1.8
       '@smithy/signature-v4': 4.2.4
       '@smithy/types': 3.7.2
-      tslib: 2.8.1
+      tslib: 2.8.0
 
   '@aws-sdk/token-providers@3.714.0(@aws-sdk/client-sso-oidc@3.716.0(@aws-sdk/client-sts@3.716.0))':
     dependencies:
@@ -16875,7 +16854,7 @@ snapshots:
 
   '@extractus/oembed-extractor@3.2.1(encoding@0.1.13)':
     dependencies:
-      cross-fetch: 4.1.0(encoding@0.1.13)
+      cross-fetch: 4.0.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
 
@@ -17369,7 +17348,7 @@ snapshots:
       '@whatwg-node/fetch': 0.10.1
       chalk: 4.1.2
       debug: 4.4.0(supports-color@5.5.0)
-      dotenv: 16.4.7
+      dotenv: 16.4.5
       graphql: 16.9.0
       graphql-request: 6.1.0(encoding@0.1.13)(graphql@16.9.0)
       http-proxy-agent: 7.0.2
@@ -17837,7 +17816,7 @@ snapshots:
 
   '@keyv/redis@2.8.5':
     dependencies:
-      ioredis: 5.4.2
+      ioredis: 5.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -19313,7 +19292,7 @@ snapshots:
   '@sendgrid/client@8.1.4':
     dependencies:
       '@sendgrid/helpers': 8.0.0
-      axios: 1.7.9
+      axios: 1.7.7
     transitivePeerDependencies:
       - debug
 
@@ -19658,7 +19637,7 @@ snapshots:
       '@smithy/abort-controller': 3.1.9
       '@smithy/protocol-http': 4.1.8
       '@smithy/querystring-builder': 3.0.11
-      '@smithy/types': 3.7.2
+      '@smithy/types': 3.5.0
       tslib: 2.8.0
 
   '@smithy/node-http-handler@3.3.3':
@@ -19804,7 +19783,7 @@ snapshots:
   '@smithy/util-retry@3.0.3':
     dependencies:
       '@smithy/service-error-classification': 3.0.11
-      '@smithy/types': 3.7.2
+      '@smithy/types': 3.5.0
       tslib: 2.8.0
 
   '@smithy/util-stream@3.3.4':
@@ -19844,23 +19823,23 @@ snapshots:
       got: 11.8.6
       tslib: 2.8.0
 
-  '@snowplow/snowtype-core@0.10.2(encoding@0.1.13)':
+  '@snowplow/snowtype-core@0.10.2':
     dependencies:
       '@fastify/merge-json-schemas': 0.2.0
       handlebars: 4.7.8
       json-pointer: 0.6.2
-      quicktype-core: 23.0.170(encoding@0.1.13)
+      quicktype-core: 23.0.170
     transitivePeerDependencies:
       - encoding
 
-  '@snowplow/snowtype@0.10.2(commander@12.1.0)(encoding@0.1.13)':
+  '@snowplow/snowtype@0.10.2(commander@12.1.0)':
     dependencies:
       '@commander-js/extra-typings': 11.1.0(commander@12.1.0)
       '@inquirer/prompts': 3.3.2
-      '@snowplow/snowtype-core': 0.10.2(encoding@0.1.13)
+      '@snowplow/snowtype-core': 0.10.2
       chalk: 4.1.2
       cli-spinner: 0.2.10
-      dotenv: 16.4.7
+      dotenv: 16.4.5
       fs-extra: 11.2.0
       got: 11.8.6
       joi: 17.13.3
@@ -19997,13 +19976,6 @@ snapshots:
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.4
 
-  '@types/express-serve-static-core@5.0.3':
-    dependencies:
-      '@types/node': 22.10.5
-      '@types/qs': 6.9.17
-      '@types/range-parser': 1.2.7
-      '@types/send': 0.17.4
-
   '@types/express-session@1.18.0':
     dependencies:
       '@types/express': 4.17.21
@@ -20015,13 +19987,6 @@ snapshots:
       '@types/qs': 6.9.17
       '@types/serve-static': 1.15.7
 
-  '@types/express@5.0.0':
-    dependencies:
-      '@types/body-parser': 1.19.5
-      '@types/express-serve-static-core': 5.0.3
-      '@types/qs': 6.9.17
-      '@types/serve-static': 1.15.7
-
   '@types/graceful-fs@4.1.9':
     dependencies:
       '@types/node': 22.10.5
@@ -20032,7 +19997,7 @@ snapshots:
 
   '@types/graphql-upload@16.0.7':
     dependencies:
-      '@types/express': 5.0.0
+      '@types/express': 4.17.21
       '@types/koa': 2.15.0
       '@types/node': 22.10.5
       fs-capacitor: 8.0.0
@@ -20194,7 +20159,7 @@ snapshots:
 
   '@types/pg-pool@2.0.6':
     dependencies:
-      '@types/pg': 8.6.1
+      '@types/pg': 8.11.10
 
   '@types/pg@8.11.10':
     dependencies:
@@ -20347,7 +20312,7 @@ snapshots:
       '@typescript-eslint/types': 8.19.0
       '@typescript-eslint/visitor-keys': 8.19.0
       debug: 4.4.0(supports-color@5.5.0)
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.6.3
@@ -20935,7 +20900,7 @@ snapshots:
   buffer@4.9.2:
     dependencies:
       base64-js: 1.5.1
-      ieee754: 1.1.13
+      ieee754: 1.2.1
       isarray: 1.0.0
 
   buffer@5.6.0:
@@ -21121,7 +21086,7 @@ snapshots:
 
   chalk-template@1.1.0:
     dependencies:
-      chalk: 5.3.0
+      chalk: 5.4.1
 
   chalk@1.1.3:
     dependencies:
@@ -21688,12 +21653,6 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  cross-fetch@4.1.0(encoding@0.1.13):
-    dependencies:
-      node-fetch: 2.7.0(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
-
   cross-inspect@1.0.1:
     dependencies:
       tslib: 2.8.0
@@ -21954,7 +21913,7 @@ snapshots:
   dotenv-cli@8.0.0:
     dependencies:
       cross-spawn: 7.0.6
-      dotenv: 16.4.7
+      dotenv: 16.4.5
       dotenv-expand: 10.0.0
       minimist: 1.2.8
 
@@ -21962,14 +21921,12 @@ snapshots:
 
   dotenv-expand@11.0.7:
     dependencies:
-      dotenv: 16.4.7
+      dotenv: 16.4.5
 
   dotenv@16.0.3: {}
 
   dotenv@16.4.5: {}
 
-  dotenv@16.4.7: {}
-
   dotenv@5.0.1: {}
 
   downlevel-dts@0.11.0:
@@ -22535,7 +22492,7 @@ snapshots:
 
   fast-fifo@1.3.2: {}
 
-  fast-glob@3.3.2:
+  fast-glob@3.3.3:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
@@ -23003,7 +22960,7 @@ snapshots:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       ignore: 5.3.2
       merge2: 1.4.1
       slash: 3.0.0
@@ -23011,7 +22968,7 @@ snapshots:
   globby@14.0.2:
     dependencies:
       '@sindresorhus/merge-streams': 2.3.0
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       ignore: 5.3.2
       path-type: 5.0.0
       slash: 5.1.0
@@ -23128,7 +23085,7 @@ snapshots:
   graphql-tag@2.12.6(graphql@16.9.0):
     dependencies:
       graphql: 16.9.0
-      tslib: 2.8.1
+      tslib: 2.8.0
 
   graphql-ws@5.16.0(graphql@16.9.0):
     dependencies:
@@ -23566,20 +23523,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ioredis@5.4.2:
-    dependencies:
-      '@ioredis/commands': 1.2.0
-      cluster-key-slot: 1.1.2
-      debug: 4.4.0(supports-color@5.5.0)
-      denque: 2.1.0
-      lodash.defaults: 4.2.0
-      lodash.isarguments: 3.1.0
-      redis-errors: 1.2.0
-      redis-parser: 3.0.0
-      standard-as-callback: 2.1.0
-    transitivePeerDependencies:
-      - supports-color
-
   ip-address@9.0.5:
     dependencies:
       jsbn: 1.1.0
@@ -24261,7 +24204,7 @@ snapshots:
       '@xmldom/xmldom': 0.8.10
       chalk: 4.1.2
       commonmark: 0.31.2
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       jsii: 5.4.31
       semver: 7.6.3
       semver-intersect: 1.5.0
@@ -24485,7 +24428,7 @@ snapshots:
   kysely-codegen@0.17.0(kysely@0.27.5)(mysql2@3.11.3)(pg@8.13.1)(tarn@3.0.2):
     dependencies:
       chalk: 4.1.2
-      dotenv: 16.4.7
+      dotenv: 16.4.5
       dotenv-expand: 11.0.7
       git-diff: 2.0.6
       kysely: 0.27.5
@@ -24500,7 +24443,7 @@ snapshots:
   kysely-codegen@0.17.0(kysely@0.27.5)(mysql2@3.11.4)(pg@8.13.1)(tarn@3.0.2):
     dependencies:
       chalk: 4.1.2
-      dotenv: 16.4.7
+      dotenv: 16.4.5
       dotenv-expand: 11.0.7
       git-diff: 2.0.6
       kysely: 0.27.5
@@ -25309,7 +25252,7 @@ snapshots:
 
   ora@8.0.1:
     dependencies:
-      chalk: 5.3.0
+      chalk: 5.4.1
       cli-cursor: 4.0.0
       cli-spinners: 2.9.2
       is-interactive: 2.0.0
@@ -25864,10 +25807,6 @@ snapshots:
     dependencies:
       side-channel: 1.1.0
 
-  qs@6.13.1:
-    dependencies:
-      side-channel: 1.1.0
-
   querystring@0.2.0: {}
 
   queue-microtask@1.2.3: {}
@@ -25876,7 +25815,7 @@ snapshots:
 
   quick-lru@5.1.1: {}
 
-  quicktype-core@23.0.170(encoding@0.1.13):
+  quicktype-core@23.0.170:
     dependencies:
       '@glideapps/ts-necessities': 2.2.3
       browser-or-node: 3.0.0
@@ -26788,7 +26727,7 @@ snapshots:
   stripe@16.9.0:
     dependencies:
       '@types/node': 22.10.5
-      qs: 6.13.1
+      qs: 6.13.0
 
   striptags@3.2.0: {}
 
@@ -26822,7 +26761,7 @@ snapshots:
       formidable: 3.5.2
       methods: 1.1.2
       mime: 2.6.0
-      qs: 6.13.1
+      qs: 6.13.0
     transitivePeerDependencies:
       - supports-color
 
@@ -26878,7 +26817,7 @@ snapshots:
   synckit@0.9.2:
     dependencies:
       '@pkgr/core': 0.1.1
-      tslib: 2.8.1
+      tslib: 2.8.0
 
   syncpack@13.0.0(typescript@5.8.0-dev.20250107):
     dependencies:
@@ -27104,7 +27043,7 @@ snapshots:
       json5: 2.2.3
       normalize-path: 3.0.0
       safe-stable-stringify: 2.5.0
-      tslib: 2.8.1
+      tslib: 2.8.0
       typescript: 5.7.2
 
   ts-log@2.2.7: {}
diff --git a/servers/account-data-deleter/package.json b/servers/account-data-deleter/package.json
index a7473e082..922982276 100644
--- a/servers/account-data-deleter/package.json
+++ b/servers/account-data-deleter/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "account-data-deleter",
+  "name": "@server/account-data-deleter",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/annotations-api/package.json b/servers/annotations-api/package.json
index 63d9542e6..3ecba7a10 100644
--- a/servers/annotations-api/package.json
+++ b/servers/annotations-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "annotations-api",
+  "name": "@server/annotations-api",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/braze-content-proxy/package.json b/servers/braze-content-proxy/package.json
index 5fd336201..8714645ff 100644
--- a/servers/braze-content-proxy/package.json
+++ b/servers/braze-content-proxy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "braze-content-proxy",
+  "name": "@server/braze-content-proxy",
   "version": "1.0.0",
   "main": "dist/main.js",
   "scripts": {
diff --git a/servers/feature-flags/package.json b/servers/feature-flags/package.json
index 23d74ca5d..8d330f33b 100644
--- a/servers/feature-flags/package.json
+++ b/servers/feature-flags/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "feature-flags",
+  "name": "@server/feature-flags",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/image-api/package.json b/servers/image-api/package.json
index 1f180d8a6..813f8b4e2 100644
--- a/servers/image-api/package.json
+++ b/servers/image-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "image-api",
+  "name": "@server/image-api",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/list-api/package.json b/servers/list-api/package.json
index 3ab4a5394..77cde688b 100644
--- a/servers/list-api/package.json
+++ b/servers/list-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "list-api",
+  "name": "@server/list-api",
   "version": "1.0.0",
   "main": "dist/server/main.js",
   "files": [
diff --git a/servers/notes-api/package.json b/servers/notes-api/package.json
index 1fb32ea47..343937f1c 100644
--- a/servers/notes-api/package.json
+++ b/servers/notes-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "notes-api",
+  "name": "@server/notes-api",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/parser-graphql-wrapper/package.json b/servers/parser-graphql-wrapper/package.json
index d5718f127..b9cd9715b 100644
--- a/servers/parser-graphql-wrapper/package.json
+++ b/servers/parser-graphql-wrapper/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "parser-graphql-wrapper",
+  "name": "@server/parser-graphql-wrapper",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/push-server/package.json b/servers/push-server/package.json
index 7895b9295..11d2a2aa1 100644
--- a/servers/push-server/package.json
+++ b/servers/push-server/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "push-server",
+  "name": "@server/push-server",
   "version": "1.0.0",
   "private": true,
   "description": "Push notification server",
diff --git a/servers/shareable-lists-api/README.md b/servers/shareable-lists-api/README.md
index c40721a73..00e5ad9b0 100644
--- a/servers/shareable-lists-api/README.md
+++ b/servers/shareable-lists-api/README.md
@@ -60,7 +60,7 @@ The sample headers below allow full access to all queries and mutations:
 ```typescript
 {
   "groups": "mozilliansorg_pocket_moderation_full",
-  "name": "Matt McPockets",
+  "name": "@server/Matt McPockets",
   "username": "mmcpockets"
 }
 ```
diff --git a/servers/shareable-lists-api/package.json b/servers/shareable-lists-api/package.json
index 9bca96e87..da8416389 100644
--- a/servers/shareable-lists-api/package.json
+++ b/servers/shareable-lists-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shareable-lists-api",
+  "name": "@server/shareable-lists-api",
   "version": "1.0.0",
   "main": "dist/main.js",
   "files": [
diff --git a/servers/shareable-lists-api/prisma/src/generated/client/index.js b/servers/shareable-lists-api/prisma/src/generated/client/index.js
index 5165122e8..5e442c39e 100644
--- a/servers/shareable-lists-api/prisma/src/generated/client/index.js
+++ b/servers/shareable-lists-api/prisma/src/generated/client/index.js
@@ -177,7 +177,7 @@ exports.Prisma.dmmf = JSON.parse(dmmfString)
  */
 const config = {
   "generator": {
-    "name": "client",
+    "name": "@server/client",
     "provider": {
       "fromEnvVar": null,
       "value": "prisma-client-js"
diff --git a/servers/shareable-lists-api/prisma/src/generated/client/package.json b/servers/shareable-lists-api/prisma/src/generated/client/package.json
index a43afe924..843ac3770 100644
--- a/servers/shareable-lists-api/prisma/src/generated/client/package.json
+++ b/servers/shareable-lists-api/prisma/src/generated/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": ".prisma/client",
+  "name": "@server/.prisma/client",
   "main": "index.js",
   "browser": "index-browser.js",
   "types": "index.d.ts"
diff --git a/servers/shared-snowplow-consumer/package.json b/servers/shared-snowplow-consumer/package.json
index 7e4ac18b1..27c580736 100644
--- a/servers/shared-snowplow-consumer/package.json
+++ b/servers/shared-snowplow-consumer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shared-snowplow-consumer",
+  "name": "@server/shared-snowplow-consumer",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/shares-api/package.json b/servers/shares-api/package.json
index a1ecc69d1..429168c28 100644
--- a/servers/shares-api/package.json
+++ b/servers/shares-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shares-api",
+  "name": "@server/shares-api",
   "version": "1.0.0",
   "description": "",
   "license": "ISC",
diff --git a/servers/user-api/package.json b/servers/user-api/package.json
index a9f85a26c..d8ce6913e 100644
--- a/servers/user-api/package.json
+++ b/servers/user-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-api",
+  "name": "@server/user-api",
   "version": "1.0.0",
   "main": "dist/main.js",
   "files": [
diff --git a/servers/user-list-search/package.json b/servers/user-list-search/package.json
index b92c09e10..64f86cae7 100644
--- a/servers/user-list-search/package.json
+++ b/servers/user-list-search/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "user-list-search",
+  "name": "@server/user-list-search",
   "version": "1.0.0",
   "description": "",
   "main": "dist/main.js",
diff --git a/servers/v3-proxy-api/package.json b/servers/v3-proxy-api/package.json
index 301f1907e..e80e0f8ce 100644
--- a/servers/v3-proxy-api/package.json
+++ b/servers/v3-proxy-api/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "v3-proxy-api",
+  "name": "@server/v3-proxy-api",
   "version": "1.0.0",
   "description": "",
   "main": "dist/main.js",