diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7b1f320f8..4b48d163d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -94,81 +94,3 @@ jobs:
     name: E2E
     uses: standardnotes/server/.github/workflows/common-e2e.yml@main
     secrets: inherit
-
-  legacy_e2e:
-    needs: build
-    name: Legacy E2E
-    strategy:
-      matrix:
-        application:
-          - { "service_name": "api-gateway", "workspace_name": "@standardnotes/api-gateway", "e2e_tag_parameter_name": "api_gateway_image_tag", "package_path": "packages/api-gateway" }
-          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }
-          - { "service_name": "files", "workspace_name": "@standardnotes/files-server", "e2e_tag_parameter_name": "files_image_tag", "package_path": "packages/files" }
-          - { "service_name": "revisions", "workspace_name": "@standardnotes/revisions-server", "e2e_tag_parameter_name": "revisions_image_tag", "package_path": "packages/revisions"}
-          - { "service_name": "syncing-server-js",  "workspace_name": "@standardnotes/syncing-server", "e2e_tag_parameter_name": "syncing_server_js_image_tag", "package_path": "packages/syncing-server" }
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ matrix.application.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.legacy_e2e.outputs.temp_dir }}
-        key: ${{ runner.os }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build
-
-    - name: Bundle
-      run: yarn workspace ${{ matrix.application.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@master
-      with:
-        platforms: all
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@master
-
-    - name: Publish Docker image for E2E testing
-      uses: docker/build-push-action@v3
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ steps.bundle-dir.outputs.temp_dir }}
-        file: ${{ steps.bundle-dir.outputs.temp_dir }}/${{ matrix.application.package_path }}/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: standardnotes/${{ matrix.application.service_name }}:${{ github.sha }}
-
-    - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@master
-      with:
-        owner: standardnotes
-        repo: self-hosted
-        github_token: ${{ secrets.CI_PAT_TOKEN }}
-        workflow_file_name: testing-with-updating-client-and-server.yml
-        wait_interval: 30
-        client_payload: '{"${{ matrix.application.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
-        propagate_failure: true
-        trigger_workflow: true
-        wait_workflow: true
diff --git a/.pnp.cjs b/.pnp.cjs
index efd090a12..1f4474893 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -4083,17 +4083,17 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@standardnotes/api", [\
-      ["npm:1.24.10", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-api-npm-1.24.10-63391538ba-1b9a97fdd8.zip/node_modules/@standardnotes/api/",\
+      ["npm:1.25.3", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-api-npm-1.25.3-29ba336725-bc7953c440.zip/node_modules/@standardnotes/api/",\
         "packageDependencies": [\
-          ["@standardnotes/api", "npm:1.24.10"],\
+          ["@standardnotes/api", "npm:1.25.3"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
-          ["@standardnotes/encryption", "npm:1.21.9"],\
-          ["@standardnotes/models", "npm:1.42.11"],\
-          ["@standardnotes/responses", "npm:1.13.6"],\
+          ["@standardnotes/encryption", "npm:1.21.17"],\
+          ["@standardnotes/models", "npm:1.43.5"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/security", "workspace:packages/security"],\
-          ["@standardnotes/utils", "npm:1.16.3"],\
+          ["@standardnotes/utils", "npm:1.16.4"],\
           ["reflect-metadata", "npm:0.1.13"]\
         ],\
         "linkType": "HARD"\
@@ -4158,14 +4158,14 @@ const RAW_RUNTIME_STATE =
           ["@sentry/tracing", "npm:7.28.1"],\
           ["@simplewebauthn/server", "npm:7.0.1"],\
           ["@simplewebauthn/typescript-types", "npm:7.0.0"],\
-          ["@standardnotes/api", "npm:1.24.10"],\
+          ["@standardnotes/api", "npm:1.25.3"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/features", "npm:1.58.4"],\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
-          ["@standardnotes/responses", "npm:1.13.4"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/security", "workspace:packages/security"],\
           ["@standardnotes/settings", "workspace:packages/settings"],\
           ["@standardnotes/sncrypto-common", "npm:1.13.0"],\
@@ -4302,15 +4302,15 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@standardnotes/encryption", [\
-      ["npm:1.21.9", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-encryption-npm-1.21.9-092bc2cb51-dc1336cc05.zip/node_modules/@standardnotes/encryption/",\
+      ["npm:1.21.17", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-encryption-npm-1.21.17-0801937c9c-ece7ac644e.zip/node_modules/@standardnotes/encryption/",\
         "packageDependencies": [\
-          ["@standardnotes/encryption", "npm:1.21.9"],\
+          ["@standardnotes/encryption", "npm:1.21.17"],\
           ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/models", "npm:1.42.11"],\
-          ["@standardnotes/responses", "npm:1.13.6"],\
+          ["@standardnotes/models", "npm:1.43.5"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/sncrypto-common", "npm:1.13.3"],\
-          ["@standardnotes/utils", "npm:1.16.3"],\
+          ["@standardnotes/utils", "npm:1.16.4"],\
           ["reflect-metadata", "npm:0.1.13"]\
         ],\
         "linkType": "HARD"\
@@ -4359,10 +4359,10 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "HARD"\
       }],\
-      ["npm:1.58.6", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-features-npm-1.58.6-7b1e198c39-98550416f1.zip/node_modules/@standardnotes/features/",\
+      ["npm:1.58.8", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-features-npm-1.58.8-d97ff2aae1-77bac7d0a0.zip/node_modules/@standardnotes/features/",\
         "packageDependencies": [\
-          ["@standardnotes/features", "npm:1.58.6"],\
+          ["@standardnotes/features", "npm:1.58.8"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/security", "workspace:packages/security"],\
@@ -4428,14 +4428,14 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@standardnotes/models", [\
-      ["npm:1.42.11", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-models-npm-1.42.11-7db16001ef-6ff3409f70.zip/node_modules/@standardnotes/models/",\
+      ["npm:1.43.5", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-models-npm-1.43.5-5180388ed4-fd8e3b60bd.zip/node_modules/@standardnotes/models/",\
         "packageDependencies": [\
-          ["@standardnotes/models", "npm:1.42.11"],\
+          ["@standardnotes/models", "npm:1.43.5"],\
           ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/features", "npm:1.58.6"],\
-          ["@standardnotes/responses", "npm:1.13.6"],\
-          ["@standardnotes/utils", "npm:1.16.3"],\
+          ["@standardnotes/features", "npm:1.58.8"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
+          ["@standardnotes/utils", "npm:1.16.4"],\
           ["lodash", "npm:4.17.21"]\
         ],\
         "linkType": "HARD"\
@@ -4457,23 +4457,12 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@standardnotes/responses", [\
-      ["npm:1.13.4", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-responses-npm-1.13.4-70cbd72561-4803ee14bd.zip/node_modules/@standardnotes/responses/",\
+      ["npm:1.13.9", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-responses-npm-1.13.9-5b1858da5d-5cb5daf9f3.zip/node_modules/@standardnotes/responses/",\
         "packageDependencies": [\
-          ["@standardnotes/responses", "npm:1.13.4"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/features", "npm:1.58.4"],\
-          ["@standardnotes/security", "workspace:packages/security"],\
-          ["reflect-metadata", "npm:0.1.13"]\
-        ],\
-        "linkType": "HARD"\
-      }],\
-      ["npm:1.13.6", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-responses-npm-1.13.6-5df25fe3dd-c57e3e1fa1.zip/node_modules/@standardnotes/responses/",\
-        "packageDependencies": [\
-          ["@standardnotes/responses", "npm:1.13.6"],\
-          ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/features", "npm:1.58.6"],\
+          ["@standardnotes/features", "npm:1.58.8"],\
           ["@standardnotes/security", "workspace:packages/security"],\
           ["reflect-metadata", "npm:0.1.13"]\
         ],\
@@ -4489,11 +4478,12 @@ const RAW_RUNTIME_STATE =
           ["@aws-sdk/client-sqs", "npm:3.259.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.28.1"],\
-          ["@standardnotes/api", "npm:1.24.10"],\
+          ["@standardnotes/api", "npm:1.25.3"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/security", "workspace:packages/security"],\
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/cors", "npm:2.8.12"],\
@@ -4668,12 +4658,12 @@ const RAW_RUNTIME_STATE =
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.28.1"],\
           ["@sentry/tracing", "npm:7.28.1"],\
-          ["@standardnotes/api", "npm:1.24.10"],\
+          ["@standardnotes/api", "npm:1.25.3"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
-          ["@standardnotes/responses", "npm:1.13.4"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/security", "workspace:packages/security"],\
           ["@standardnotes/settings", "workspace:packages/settings"],\
           ["@standardnotes/time", "workspace:packages/time"],\
@@ -4746,10 +4736,10 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "HARD"\
       }],\
-      ["npm:1.16.3", {\
-        "packageLocation": "./.yarn/cache/@standardnotes-utils-npm-1.16.3-87b47ad954-5c34beaafb.zip/node_modules/@standardnotes/utils/",\
+      ["npm:1.16.4", {\
+        "packageLocation": "./.yarn/cache/@standardnotes-utils-npm-1.16.4-d7c627b154-ed29da54cb.zip/node_modules/@standardnotes/utils/",\
         "packageDependencies": [\
-          ["@standardnotes/utils", "npm:1.16.3"],\
+          ["@standardnotes/utils", "npm:1.16.4"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["dompurify", "npm:2.4.3"],\
           ["lodash", "npm:4.17.21"],\
@@ -4766,11 +4756,12 @@ const RAW_RUNTIME_STATE =
           ["@aws-sdk/client-sqs", "npm:3.259.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.28.1"],\
-          ["@standardnotes/api", "npm:1.24.10"],\
+          ["@standardnotes/api", "npm:1.25.3"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+          ["@standardnotes/responses", "npm:1.13.9"],\
           ["@standardnotes/security", "workspace:packages/security"],\
           ["@standardnotes/utils", "npm:1.16.2"],\
           ["@types/cors", "npm:2.8.12"],\
diff --git a/.yarn/cache/@standardnotes-api-npm-1.24.10-63391538ba-1b9a97fdd8.zip b/.yarn/cache/@standardnotes-api-npm-1.24.10-63391538ba-1b9a97fdd8.zip
deleted file mode 100644
index fc0c8d24b..000000000
Binary files a/.yarn/cache/@standardnotes-api-npm-1.24.10-63391538ba-1b9a97fdd8.zip and /dev/null differ
diff --git a/.yarn/cache/@standardnotes-api-npm-1.25.3-29ba336725-bc7953c440.zip b/.yarn/cache/@standardnotes-api-npm-1.25.3-29ba336725-bc7953c440.zip
new file mode 100644
index 000000000..6a811182b
Binary files /dev/null and b/.yarn/cache/@standardnotes-api-npm-1.25.3-29ba336725-bc7953c440.zip differ
diff --git a/.yarn/cache/@standardnotes-encryption-npm-1.21.9-092bc2cb51-dc1336cc05.zip b/.yarn/cache/@standardnotes-encryption-npm-1.21.17-0801937c9c-ece7ac644e.zip
similarity index 89%
rename from .yarn/cache/@standardnotes-encryption-npm-1.21.9-092bc2cb51-dc1336cc05.zip
rename to .yarn/cache/@standardnotes-encryption-npm-1.21.17-0801937c9c-ece7ac644e.zip
index fde97dcce..babc34459 100644
Binary files a/.yarn/cache/@standardnotes-encryption-npm-1.21.9-092bc2cb51-dc1336cc05.zip and b/.yarn/cache/@standardnotes-encryption-npm-1.21.17-0801937c9c-ece7ac644e.zip differ
diff --git a/.yarn/cache/@standardnotes-features-npm-1.58.6-7b1e198c39-98550416f1.zip b/.yarn/cache/@standardnotes-features-npm-1.58.8-d97ff2aae1-77bac7d0a0.zip
similarity index 80%
rename from .yarn/cache/@standardnotes-features-npm-1.58.6-7b1e198c39-98550416f1.zip
rename to .yarn/cache/@standardnotes-features-npm-1.58.8-d97ff2aae1-77bac7d0a0.zip
index b8858fe4f..4ca04d723 100644
Binary files a/.yarn/cache/@standardnotes-features-npm-1.58.6-7b1e198c39-98550416f1.zip and b/.yarn/cache/@standardnotes-features-npm-1.58.8-d97ff2aae1-77bac7d0a0.zip differ
diff --git a/.yarn/cache/@standardnotes-models-npm-1.42.11-7db16001ef-6ff3409f70.zip b/.yarn/cache/@standardnotes-models-npm-1.43.5-5180388ed4-fd8e3b60bd.zip
similarity index 85%
rename from .yarn/cache/@standardnotes-models-npm-1.42.11-7db16001ef-6ff3409f70.zip
rename to .yarn/cache/@standardnotes-models-npm-1.43.5-5180388ed4-fd8e3b60bd.zip
index b476a3113..ec8865566 100644
Binary files a/.yarn/cache/@standardnotes-models-npm-1.42.11-7db16001ef-6ff3409f70.zip and b/.yarn/cache/@standardnotes-models-npm-1.43.5-5180388ed4-fd8e3b60bd.zip differ
diff --git a/.yarn/cache/@standardnotes-responses-npm-1.13.4-70cbd72561-4803ee14bd.zip b/.yarn/cache/@standardnotes-responses-npm-1.13.4-70cbd72561-4803ee14bd.zip
deleted file mode 100644
index 90f0865ef..000000000
Binary files a/.yarn/cache/@standardnotes-responses-npm-1.13.4-70cbd72561-4803ee14bd.zip and /dev/null differ
diff --git a/.yarn/cache/@standardnotes-responses-npm-1.13.6-5df25fe3dd-c57e3e1fa1.zip b/.yarn/cache/@standardnotes-responses-npm-1.13.6-5df25fe3dd-c57e3e1fa1.zip
deleted file mode 100644
index fa0062393..000000000
Binary files a/.yarn/cache/@standardnotes-responses-npm-1.13.6-5df25fe3dd-c57e3e1fa1.zip and /dev/null differ
diff --git a/.yarn/cache/@standardnotes-responses-npm-1.13.9-5b1858da5d-5cb5daf9f3.zip b/.yarn/cache/@standardnotes-responses-npm-1.13.9-5b1858da5d-5cb5daf9f3.zip
new file mode 100644
index 000000000..ea1199b9b
Binary files /dev/null and b/.yarn/cache/@standardnotes-responses-npm-1.13.9-5b1858da5d-5cb5daf9f3.zip differ
diff --git a/.yarn/cache/@standardnotes-utils-npm-1.16.3-87b47ad954-5c34beaafb.zip b/.yarn/cache/@standardnotes-utils-npm-1.16.4-d7c627b154-ed29da54cb.zip
similarity index 91%
rename from .yarn/cache/@standardnotes-utils-npm-1.16.3-87b47ad954-5c34beaafb.zip
rename to .yarn/cache/@standardnotes-utils-npm-1.16.4-d7c627b154-ed29da54cb.zip
index 249d0571e..e3aeedff4 100644
Binary files a/.yarn/cache/@standardnotes-utils-npm-1.16.3-87b47ad954-5c34beaafb.zip and b/.yarn/cache/@standardnotes-utils-npm-1.16.4-d7c627b154-ed29da54cb.zip differ
diff --git a/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Makefile b/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Makefile
index 02d8bdfb6..38879ed56 100644
--- a/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Makefile
+++ b/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Makefile
@@ -327,7 +327,7 @@ endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
 cmd_regen_makefile = cd $(srcdir); /Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/mo/Library/Caches/node-gyp/18.13.0" "-Dnode_gyp_dir=/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp" "-Dnode_lib_file=/Users/mo/Library/Caches/node-gyp/18.13.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/config.gypi -I/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi -I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../../../../../../Library/Caches/node-gyp/18.13.0/include/node/common.gypi
+Makefile: $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../../../../../../Library/Caches/node-gyp/18.13.0/include/node/common.gypi $(srcdir)/build/config.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included
diff --git a/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/_newrelic_native_metrics-9_0_0-native_metrics-108-darwin-arm64.node b/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/_newrelic_native_metrics-9_0_0-native_metrics-108-darwin-arm64.node
index a717e58b8..72f83a9a2 100755
Binary files a/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/_newrelic_native_metrics-9_0_0-native_metrics-108-darwin-arm64.node and b/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/_newrelic_native_metrics-9_0_0-native_metrics-108-darwin-arm64.node differ
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 45b0c4d91..6e1b3fa56 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -40,14 +40,14 @@
     "@sentry/node": "^7.28.1",
     "@sentry/tracing": "^7.28.1",
     "@simplewebauthn/server": "^7.0.1",
-    "@standardnotes/api": "^1.24.10",
+    "@standardnotes/api": "^1.25.3",
     "@standardnotes/common": "workspace:*",
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/features": "^1.58.4",
     "@standardnotes/predicates": "workspace:*",
-    "@standardnotes/responses": "^1.13.4",
+    "@standardnotes/responses": "^1.13.9",
     "@standardnotes/security": "workspace:*",
     "@standardnotes/settings": "workspace:*",
     "@standardnotes/sncrypto-common": "^1.9.0",
diff --git a/packages/auth/src/Controller/AuthController.ts b/packages/auth/src/Controller/AuthController.ts
index 2b7398f2a..800621d0b 100644
--- a/packages/auth/src/Controller/AuthController.ts
+++ b/packages/auth/src/Controller/AuthController.ts
@@ -2,12 +2,12 @@ import { inject, injectable } from 'inversify'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
 import {
   ApiVersion,
-  HttpStatusCode,
-  UserDeletionResponse,
   UserRegistrationRequestParams,
-  UserRegistrationResponse,
   UserServerInterface,
+  UserDeletionResponseBody,
+  UserRegistrationResponseBody,
 } from '@standardnotes/api'
+import { HttpResponse, HttpStatusCode } from '@standardnotes/responses'
 import { ProtocolVersion } from '@standardnotes/common'
 
 import TYPES from '../Bootstrap/Types'
@@ -16,13 +16,13 @@ import { Register } from '../Domain/UseCase/Register'
 import { DomainEventFactoryInterface } from '../Domain/Event/DomainEventFactoryInterface'
 import { SignInWithRecoveryCodes } from '../Domain/UseCase/SignInWithRecoveryCodes/SignInWithRecoveryCodes'
 import { SignInWithRecoveryCodesRequestParams } from '../Infra/Http/Request/SignInWithRecoveryCodesRequestParams'
-import { SignInWithRecoveryCodesResponse } from '../Infra/Http/Response/SignInWithRecoveryCodesResponse'
 import { GetUserKeyParamsRecovery } from '../Domain/UseCase/GetUserKeyParamsRecovery/GetUserKeyParamsRecovery'
 import { RecoveryKeyParamsRequestParams } from '../Infra/Http/Request/RecoveryKeyParamsRequestParams'
-import { RecoveryKeyParamsResponse } from '../Infra/Http/Response/RecoveryKeyParamsResponse'
+import { SignInWithRecoveryCodesResponseBody } from '../Infra/Http/Response/SignInWithRecoveryCodesResponseBody'
+import { RecoveryKeyParamsResponseBody } from '../Infra/Http/Response/RecoveryKeyParamsResponseBody'
+import { GenerateRecoveryCodesResponseBody } from '../Infra/Http/Response/GenerateRecoveryCodesResponseBody'
 import { GenerateRecoveryCodes } from '../Domain/UseCase/GenerateRecoveryCodes/GenerateRecoveryCodes'
 import { GenerateRecoveryCodesRequestParams } from '../Infra/Http/Request/GenerateRecoveryCodesRequestParams'
-import { GenerateRecoveryCodesResponse } from '../Infra/Http/Response/GenerateRecoveryCodesResponse'
 import { Logger } from 'winston'
 
 @injectable()
@@ -38,11 +38,11 @@ export class AuthController implements UserServerInterface {
     @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
-  async deleteAccount(_params: never): Promise<UserDeletionResponse> {
+  async deleteAccount(_params: never): Promise<HttpResponse<UserDeletionResponseBody>> {
     throw new Error('This method is implemented on the payments server.')
   }
 
-  async register(params: UserRegistrationRequestParams): Promise<UserRegistrationResponse> {
+  async register(params: UserRegistrationRequestParams): Promise<HttpResponse<UserRegistrationResponseBody>> {
     if (!params.email || !params.password) {
       return {
         status: HttpStatusCode.BadRequest,
@@ -93,7 +93,9 @@ export class AuthController implements UserServerInterface {
     }
   }
 
-  async generateRecoveryCodes(params: GenerateRecoveryCodesRequestParams): Promise<GenerateRecoveryCodesResponse> {
+  async generateRecoveryCodes(
+    params: GenerateRecoveryCodesRequestParams,
+  ): Promise<HttpResponse<GenerateRecoveryCodesResponseBody>> {
     const result = await this.doGenerateRecoveryCodes.execute({
       userUuid: params.userUuid,
     })
@@ -119,7 +121,7 @@ export class AuthController implements UserServerInterface {
 
   async signInWithRecoveryCodes(
     params: SignInWithRecoveryCodesRequestParams,
-  ): Promise<SignInWithRecoveryCodesResponse> {
+  ): Promise<HttpResponse<SignInWithRecoveryCodesResponseBody>> {
     if (params.apiVersion !== ApiVersion.v0) {
       return {
         status: HttpStatusCode.BadRequest,
@@ -158,7 +160,9 @@ export class AuthController implements UserServerInterface {
     }
   }
 
-  async recoveryKeyParams(params: RecoveryKeyParamsRequestParams): Promise<RecoveryKeyParamsResponse> {
+  async recoveryKeyParams(
+    params: RecoveryKeyParamsRequestParams,
+  ): Promise<HttpResponse<RecoveryKeyParamsResponseBody>> {
     if (params.apiVersion !== ApiVersion.v0) {
       return {
         status: HttpStatusCode.BadRequest,
diff --git a/packages/auth/src/Controller/AuthenticatorsController.ts b/packages/auth/src/Controller/AuthenticatorsController.ts
index 16fe1f9ec..1a424bae6 100644
--- a/packages/auth/src/Controller/AuthenticatorsController.ts
+++ b/packages/auth/src/Controller/AuthenticatorsController.ts
@@ -1,4 +1,4 @@
-import { HttpStatusCode } from '@standardnotes/api'
+import { HttpResponse, HttpStatusCode } from '@standardnotes/responses'
 import { MapperInterface } from '@standardnotes/domain-core'
 import { Authenticator } from '../Domain/Authenticator/Authenticator'
 import { DeleteAuthenticator } from '../Domain/UseCase/DeleteAuthenticator/DeleteAuthenticator'
@@ -13,11 +13,11 @@ import { GenerateAuthenticatorAuthenticationOptionsRequestParams } from '../Infr
 import { GenerateAuthenticatorRegistrationOptionsRequestParams } from '../Infra/Http/Request/GenerateAuthenticatorRegistrationOptionsRequestParams'
 import { ListAuthenticatorsRequestParams } from '../Infra/Http/Request/ListAuthenticatorsRequestParams'
 import { VerifyAuthenticatorRegistrationResponseRequestParams } from '../Infra/Http/Request/VerifyAuthenticatorRegistrationResponseRequestParams'
-import { DeleteAuthenticatorResponse } from '../Infra/Http/Response/DeleteAuthenticatorResponse'
-import { GenerateAuthenticatorAuthenticationOptionsResponse } from '../Infra/Http/Response/GenerateAuthenticatorAuthenticationOptionsResponse'
-import { GenerateAuthenticatorRegistrationOptionsResponse } from '../Infra/Http/Response/GenerateAuthenticatorRegistrationOptionsResponse'
-import { ListAuthenticatorsResponse } from '../Infra/Http/Response/ListAuthenticatorsResponse'
-import { VerifyAuthenticatorRegistrationResponseResponse } from '../Infra/Http/Response/VerifyAuthenticatorRegistrationResponseResponse'
+import { DeleteAuthenticatorResponseBody } from '../Infra/Http/Response/DeleteAuthenticatorResponseBody'
+import { GenerateAuthenticatorAuthenticationOptionsResponseBody } from '../Infra/Http/Response/GenerateAuthenticatorAuthenticationOptionsResponseBody'
+import { GenerateAuthenticatorRegistrationOptionsResponseBody } from '../Infra/Http/Response/GenerateAuthenticatorRegistrationOptionsResponseBody'
+import { ListAuthenticatorsResponseBody } from '../Infra/Http/Response/ListAuthenticatorsResponseBody'
+import { VerifyAuthenticatorRegistrationResponseResponseBody } from '../Infra/Http/Response/VerifyAuthenticatorRegistrationResponseResponseBody'
 
 export class AuthenticatorsController {
   constructor(
@@ -29,7 +29,7 @@ export class AuthenticatorsController {
     private authenticatorHttpMapper: MapperInterface<Authenticator, AuthenticatorHttpProjection>,
   ) {}
 
-  async list(params: ListAuthenticatorsRequestParams): Promise<ListAuthenticatorsResponse> {
+  async list(params: ListAuthenticatorsRequestParams): Promise<HttpResponse<ListAuthenticatorsResponseBody>> {
     const result = await this.listAuthenticators.execute({
       userUuid: params.userUuid,
     })
@@ -44,7 +44,7 @@ export class AuthenticatorsController {
     }
   }
 
-  async delete(params: DeleteAuthenticatorRequestParams): Promise<DeleteAuthenticatorResponse> {
+  async delete(params: DeleteAuthenticatorRequestParams): Promise<HttpResponse<DeleteAuthenticatorResponseBody>> {
     const result = await this.deleteAuthenticator.execute({
       userUuid: params.userUuid,
       authenticatorId: params.authenticatorId,
@@ -60,7 +60,7 @@ export class AuthenticatorsController {
 
   async generateRegistrationOptions(
     params: GenerateAuthenticatorRegistrationOptionsRequestParams,
-  ): Promise<GenerateAuthenticatorRegistrationOptionsResponse> {
+  ): Promise<HttpResponse<GenerateAuthenticatorRegistrationOptionsResponseBody>> {
     const result = await this.generateAuthenticatorRegistrationOptions.execute({
       userUuid: params.userUuid,
       username: params.username,
@@ -85,7 +85,7 @@ export class AuthenticatorsController {
 
   async verifyRegistrationResponse(
     params: VerifyAuthenticatorRegistrationResponseRequestParams,
-  ): Promise<VerifyAuthenticatorRegistrationResponseResponse> {
+  ): Promise<HttpResponse<VerifyAuthenticatorRegistrationResponseResponseBody>> {
     const result = await this.verifyAuthenticatorRegistrationResponse.execute({
       userUuid: params.userUuid,
       name: params.name,
@@ -111,7 +111,7 @@ export class AuthenticatorsController {
 
   async generateAuthenticationOptions(
     params: GenerateAuthenticatorAuthenticationOptionsRequestParams,
-  ): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
+  ): Promise<HttpResponse<GenerateAuthenticatorAuthenticationOptionsResponseBody>> {
     const result = await this.generateAuthenticatorAuthenticationOptions.execute({
       username: params.username,
     })
diff --git a/packages/auth/src/Controller/ListedController.ts b/packages/auth/src/Controller/ListedController.ts
index e4ee8b319..e724ad69e 100644
--- a/packages/auth/src/Controller/ListedController.ts
+++ b/packages/auth/src/Controller/ListedController.ts
@@ -4,7 +4,7 @@ import { BaseHttpController, controller, httpPost, results } from 'inversify-exp
 import { Request, Response } from 'express'
 import TYPES from '../Bootstrap/Types'
 import { CreateListedAccount } from '../Domain/UseCase/CreateListedAccount/CreateListedAccount'
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 
 @controller('/listed')
 export class ListedController extends BaseHttpController {
diff --git a/packages/auth/src/Controller/SessionController.ts b/packages/auth/src/Controller/SessionController.ts
index f7b54a33a..e09a5d74d 100644
--- a/packages/auth/src/Controller/SessionController.ts
+++ b/packages/auth/src/Controller/SessionController.ts
@@ -1,4 +1,4 @@
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
 import {
diff --git a/packages/auth/src/Controller/SettingsController.ts b/packages/auth/src/Controller/SettingsController.ts
index d58ebe07e..e8cdafe3f 100644
--- a/packages/auth/src/Controller/SettingsController.ts
+++ b/packages/auth/src/Controller/SettingsController.ts
@@ -1,4 +1,4 @@
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
 import {
diff --git a/packages/auth/src/Controller/SubscriptionInvitesController.ts b/packages/auth/src/Controller/SubscriptionInvitesController.ts
index a682faae6..05c562208 100644
--- a/packages/auth/src/Controller/SubscriptionInvitesController.ts
+++ b/packages/auth/src/Controller/SubscriptionInvitesController.ts
@@ -1,19 +1,19 @@
 import {
   AppleIAPConfirmRequestParams,
-  AppleIAPConfirmResponse,
-  HttpStatusCode,
+  AppleIAPConfirmResponseBody,
   SubscriptionInviteAcceptRequestParams,
-  SubscriptionInviteAcceptResponse,
+  SubscriptionInviteAcceptResponseBody,
   SubscriptionInviteCancelRequestParams,
-  SubscriptionInviteCancelResponse,
+  SubscriptionInviteCancelResponseBody,
   SubscriptionInviteDeclineRequestParams,
-  SubscriptionInviteDeclineResponse,
+  SubscriptionInviteDeclineResponseBody,
   SubscriptionInviteListRequestParams,
-  SubscriptionInviteListResponse,
+  SubscriptionInviteListResponseBody,
   SubscriptionInviteRequestParams,
-  SubscriptionInviteResponse,
+  SubscriptionInviteResponseBody,
   SubscriptionServerInterface,
 } from '@standardnotes/api'
+import { HttpResponse, HttpStatusCode } from '@standardnotes/responses'
 import { inject, injectable } from 'inversify'
 
 import TYPES from '../Bootstrap/Types'
@@ -37,11 +37,13 @@ export class SubscriptionInvitesController implements SubscriptionServerInterfac
     private listSharedSubscriptionInvitations: ListSharedSubscriptionInvitations,
   ) {}
 
-  async confirmAppleIAP(_params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse> {
+  async confirmAppleIAP(_params: AppleIAPConfirmRequestParams): Promise<HttpResponse<AppleIAPConfirmResponseBody>> {
     throw new Error('Method implemented on the payments service.')
   }
 
-  async acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse> {
+  async acceptInvite(
+    params: SubscriptionInviteAcceptRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteAcceptResponseBody>> {
     const result = await this.acceptSharedSubscriptionInvitation.execute({
       sharedSubscriptionInvitationUuid: params.inviteUuid,
     })
@@ -59,7 +61,9 @@ export class SubscriptionInvitesController implements SubscriptionServerInterfac
     }
   }
 
-  async declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse> {
+  async declineInvite(
+    params: SubscriptionInviteDeclineRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteDeclineResponseBody>> {
     const result = await this.declineSharedSubscriptionInvitation.execute({
       sharedSubscriptionInvitationUuid: params.inviteUuid,
     })
@@ -77,7 +81,7 @@ export class SubscriptionInvitesController implements SubscriptionServerInterfac
     }
   }
 
-  async invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse> {
+  async invite(params: SubscriptionInviteRequestParams): Promise<HttpResponse<SubscriptionInviteResponseBody>> {
     if (!params.identifier) {
       return {
         status: HttpStatusCode.BadRequest,
@@ -109,7 +113,9 @@ export class SubscriptionInvitesController implements SubscriptionServerInterfac
     }
   }
 
-  async cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse> {
+  async cancelInvite(
+    params: SubscriptionInviteCancelRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteCancelResponseBody>> {
     const result = await this.cancelSharedSubscriptionInvitation.execute({
       sharedSubscriptionInvitationUuid: params.inviteUuid,
       inviterEmail: params.inviterEmail as string,
@@ -128,7 +134,9 @@ export class SubscriptionInvitesController implements SubscriptionServerInterfac
     }
   }
 
-  async listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse> {
+  async listInvites(
+    params: SubscriptionInviteListRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteListResponseBody>> {
     const result = await this.listSharedSubscriptionInvitations.execute({
       inviterEmail: params.inviterEmail as string,
     })
diff --git a/packages/auth/src/Controller/SubscriptionTokensController.ts b/packages/auth/src/Controller/SubscriptionTokensController.ts
index efb024d19..bf2deb471 100644
--- a/packages/auth/src/Controller/SubscriptionTokensController.ts
+++ b/packages/auth/src/Controller/SubscriptionTokensController.ts
@@ -1,5 +1,5 @@
 import { CrossServiceTokenData, TokenEncoderInterface } from '@standardnotes/security'
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import { SettingName } from '@standardnotes/settings'
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
diff --git a/packages/auth/src/Controller/UserRequestsController.ts b/packages/auth/src/Controller/UserRequestsController.ts
index f17747b5e..0cbcf2dd0 100644
--- a/packages/auth/src/Controller/UserRequestsController.ts
+++ b/packages/auth/src/Controller/UserRequestsController.ts
@@ -1,9 +1,5 @@
-import {
-  HttpStatusCode,
-  UserRequestRequestParams,
-  UserRequestResponse,
-  UserRequestServerInterface,
-} from '@standardnotes/api'
+import { UserRequestRequestParams, UserRequestResponseBody, UserRequestServerInterface } from '@standardnotes/api'
+import { HttpResponse, HttpStatusCode } from '@standardnotes/responses'
 import { inject, injectable } from 'inversify'
 import TYPES from '../Bootstrap/Types'
 import { ProcessUserRequest } from '../Domain/UseCase/ProcessUserRequest/ProcessUserRequest'
@@ -12,7 +8,7 @@ import { ProcessUserRequest } from '../Domain/UseCase/ProcessUserRequest/Process
 export class UserRequestsController implements UserRequestServerInterface {
   constructor(@inject(TYPES.ProcessUserRequest) private processUserRequest: ProcessUserRequest) {}
 
-  async submitUserRequest(params: UserRequestRequestParams): Promise<UserRequestResponse> {
+  async submitUserRequest(params: UserRequestRequestParams): Promise<HttpResponse<UserRequestResponseBody>> {
     const result = await this.processUserRequest.execute({
       requestType: params.requestType,
       userEmail: params.userEmail as string,
diff --git a/packages/auth/src/Controller/UsersController.ts b/packages/auth/src/Controller/UsersController.ts
index 327ef87f9..7efdcb788 100644
--- a/packages/auth/src/Controller/UsersController.ts
+++ b/packages/auth/src/Controller/UsersController.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import {
   BaseHttpController,
   controller,
diff --git a/packages/auth/src/Controller/ValetTokenController.ts b/packages/auth/src/Controller/ValetTokenController.ts
index 7eecc5d36..57951a3e3 100644
--- a/packages/auth/src/Controller/ValetTokenController.ts
+++ b/packages/auth/src/Controller/ValetTokenController.ts
@@ -7,8 +7,7 @@ import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   results,
 } from 'inversify-express-utils'
-import { CreateValetTokenPayload } from '@standardnotes/responses'
-import { ErrorTag } from '@standardnotes/api'
+import { CreateValetTokenPayload, ErrorTag } from '@standardnotes/responses'
 import { ValetTokenOperation } from '@standardnotes/security'
 import { Uuid } from '@standardnotes/domain-core'
 
diff --git a/packages/auth/src/Domain/UseCase/SignIn.ts b/packages/auth/src/Domain/UseCase/SignIn.ts
index 251a8f55e..bb71be95d 100644
--- a/packages/auth/src/Domain/UseCase/SignIn.ts
+++ b/packages/auth/src/Domain/UseCase/SignIn.ts
@@ -16,7 +16,7 @@ import { PKCERepositoryInterface } from '../User/PKCERepositoryInterface'
 import { CrypterInterface } from '../Encryption/CrypterInterface'
 import { SignInDTOV2Challenged } from './SignInDTOV2Challenged'
 import { leftVersionGreaterThanOrEqualToRight, ProtocolVersion } from '@standardnotes/common'
-import { HttpStatusCode } from '@standardnotes/api'
+import { HttpStatusCode } from '@standardnotes/responses'
 import { EmailLevel } from '@standardnotes/domain-core'
 import { getBody, getSubject } from '../Email/UserSignedIn'
 
diff --git a/packages/auth/src/Domain/UseCase/SignInResponse.ts b/packages/auth/src/Domain/UseCase/SignInResponse.ts
index ea34aec69..91e40cce1 100644
--- a/packages/auth/src/Domain/UseCase/SignInResponse.ts
+++ b/packages/auth/src/Domain/UseCase/SignInResponse.ts
@@ -1,4 +1,4 @@
-import { HttpStatusCode } from '@standardnotes/api'
+import { HttpStatusCode } from '@standardnotes/responses'
 
 import { AuthResponse20161215 } from '../Auth/AuthResponse20161215'
 import { AuthResponse20200115 } from '../Auth/AuthResponse20200115'
diff --git a/packages/auth/src/Domain/UseCase/VerifyMFA.ts b/packages/auth/src/Domain/UseCase/VerifyMFA.ts
index ef47a38c8..d7d39f53f 100644
--- a/packages/auth/src/Domain/UseCase/VerifyMFA.ts
+++ b/packages/auth/src/Domain/UseCase/VerifyMFA.ts
@@ -1,5 +1,5 @@
 import * as crypto from 'crypto'
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import { SettingName } from '@standardnotes/settings'
 import { v4 as uuidv4 } from 'uuid'
 import { inject, injectable } from 'inversify'
diff --git a/packages/auth/src/Infra/Http/Response/DeleteAuthenticatorResponse.ts b/packages/auth/src/Infra/Http/Response/DeleteAuthenticatorResponse.ts
deleted file mode 100644
index 69bf5804f..000000000
--- a/packages/auth/src/Infra/Http/Response/DeleteAuthenticatorResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { DeleteAuthenticatorResponseBody } from './DeleteAuthenticatorResponseBody'
-
-export interface DeleteAuthenticatorResponse extends HttpResponse {
-  data: Either<DeleteAuthenticatorResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorAuthenticationOptionsResponse.ts b/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorAuthenticationOptionsResponse.ts
deleted file mode 100644
index c46362d39..000000000
--- a/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorAuthenticationOptionsResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { GenerateAuthenticatorAuthenticationOptionsResponseBody } from './GenerateAuthenticatorAuthenticationOptionsResponseBody'
-
-export interface GenerateAuthenticatorAuthenticationOptionsResponse extends HttpResponse {
-  data: Either<GenerateAuthenticatorAuthenticationOptionsResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorRegistrationOptionsResponse.ts b/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorRegistrationOptionsResponse.ts
deleted file mode 100644
index 6ba58123a..000000000
--- a/packages/auth/src/Infra/Http/Response/GenerateAuthenticatorRegistrationOptionsResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { GenerateAuthenticatorRegistrationOptionsResponseBody } from './GenerateAuthenticatorRegistrationOptionsResponseBody'
-
-export interface GenerateAuthenticatorRegistrationOptionsResponse extends HttpResponse {
-  data: Either<GenerateAuthenticatorRegistrationOptionsResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/GenerateRecoveryCodesResponse.ts b/packages/auth/src/Infra/Http/Response/GenerateRecoveryCodesResponse.ts
deleted file mode 100644
index 07bb0ec3d..000000000
--- a/packages/auth/src/Infra/Http/Response/GenerateRecoveryCodesResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { GenerateRecoveryCodesResponseBody } from './GenerateRecoveryCodesResponseBody'
-
-export interface GenerateRecoveryCodesResponse extends HttpResponse {
-  data: Either<GenerateRecoveryCodesResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/ListAuthenticatorsResponse.ts b/packages/auth/src/Infra/Http/Response/ListAuthenticatorsResponse.ts
deleted file mode 100644
index 05649cafd..000000000
--- a/packages/auth/src/Infra/Http/Response/ListAuthenticatorsResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { ListAuthenticatorsResponseBody } from './ListAuthenticatorsResponseBody'
-
-export interface ListAuthenticatorsResponse extends HttpResponse {
-  data: Either<ListAuthenticatorsResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/RecoveryKeyParamsResponse.ts b/packages/auth/src/Infra/Http/Response/RecoveryKeyParamsResponse.ts
deleted file mode 100644
index be0b359a9..000000000
--- a/packages/auth/src/Infra/Http/Response/RecoveryKeyParamsResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { RecoveryKeyParamsResponseBody } from './RecoveryKeyParamsResponseBody'
-
-export interface RecoveryKeyParamsResponse extends HttpResponse {
-  data: Either<RecoveryKeyParamsResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/SignInWithRecoveryCodesResponse.ts b/packages/auth/src/Infra/Http/Response/SignInWithRecoveryCodesResponse.ts
deleted file mode 100644
index 5dc60c935..000000000
--- a/packages/auth/src/Infra/Http/Response/SignInWithRecoveryCodesResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { SignInWithRecoveryCodesResponseBody } from './SignInWithRecoveryCodesResponseBody'
-
-export interface SignInWithRecoveryCodesResponse extends HttpResponse {
-  data: Either<SignInWithRecoveryCodesResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorAuthenticationResponseResponse.ts b/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorAuthenticationResponseResponse.ts
deleted file mode 100644
index 382255a58..000000000
--- a/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorAuthenticationResponseResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { VerifyAuthenticatorAuthenticationResponseResponseBody } from './VerifyAuthenticatorAuthenticationResponseResponseBody'
-
-export interface VerifyAuthenticatorAuthenticationResponseResponse extends HttpResponse {
-  data: Either<VerifyAuthenticatorAuthenticationResponseResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorRegistrationResponseResponse.ts b/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorRegistrationResponseResponse.ts
deleted file mode 100644
index e7cf3e98c..000000000
--- a/packages/auth/src/Infra/Http/Response/VerifyAuthenticatorRegistrationResponseResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { VerifyAuthenticatorRegistrationResponseResponseBody } from './VerifyAuthenticatorRegistrationResponseResponseBody'
-
-export interface VerifyAuthenticatorRegistrationResponseResponse extends HttpResponse {
-  data: Either<VerifyAuthenticatorRegistrationResponseResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
index 0b099e6f9..0c9936c87 100644
--- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
+++ b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts
@@ -1,5 +1,5 @@
 import { Request, Response } from 'express'
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import {
   BaseHttpController,
   controller,
diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts
index 35873a803..c976c5707 100644
--- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts
+++ b/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts
@@ -1,4 +1,4 @@
-import { ErrorTag } from '@standardnotes/api'
+import { ErrorTag } from '@standardnotes/responses'
 import { TokenDecoderInterface, WebSocketConnectionTokenData } from '@standardnotes/security'
 import { Request } from 'express'
 import { inject } from 'inversify'
diff --git a/packages/revisions/package.json b/packages/revisions/package.json
index f1a9d19bf..7be8d7a87 100644
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -27,11 +27,12 @@
     "@aws-sdk/client-sqs": "^3.259.0",
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.28.1",
-    "@standardnotes/api": "^1.24.10",
+    "@standardnotes/api": "^1.25.3",
     "@standardnotes/common": "workspace:^",
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
+    "@standardnotes/responses": "^1.13.9",
     "@standardnotes/security": "workspace:^",
     "@standardnotes/time": "workspace:^",
     "cors": "2.8.5",
diff --git a/packages/revisions/src/Controller/RevisionsController.ts b/packages/revisions/src/Controller/RevisionsController.ts
index a027847f7..92866517c 100644
--- a/packages/revisions/src/Controller/RevisionsController.ts
+++ b/packages/revisions/src/Controller/RevisionsController.ts
@@ -1,5 +1,5 @@
 import { Logger } from 'winston'
-import { HttpResponse, HttpStatusCode } from '@standardnotes/api'
+import { HttpResponse, HttpStatusCode } from '@standardnotes/responses'
 
 import { GetRevisionsMetada } from '../Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada'
 import { GetRevisionsMetadataRequestParams } from '../Infra/Http/Request/GetRevisionsMetadataRequestParams'
@@ -7,8 +7,8 @@ import { GetRevisionRequestParams } from '../Infra/Http/Request/GetRevisionReque
 import { DeleteRevisionRequestParams } from '../Infra/Http/Request/DeleteRevisionRequestParams'
 import { GetRevision } from '../Domain/UseCase/GetRevision/GetRevision'
 import { DeleteRevision } from '../Domain/UseCase/DeleteRevision/DeleteRevision'
-import { GetRevisionsMetadataResponse } from '../Infra/Http/Response/GetRevisionsMetadataResponse'
-import { GetRevisionResponse } from '../Infra/Http/Response/GetRevisionResponse'
+import { GetRevisionsMetadataResponseBody } from '../Infra/Http/Response/GetRevisionsMetadataResponseBody'
+import { GetRevisionResponseBody } from '../Infra/Http/Response/GetRevisionResponseBody'
 import { MapperInterface } from '@standardnotes/domain-core'
 import { Revision } from '../Domain/Revision/Revision'
 import { RevisionMetadata } from '../Domain/Revision/RevisionMetadata'
@@ -44,7 +44,9 @@ export class RevisionsController {
     private logger: Logger,
   ) {}
 
-  async getRevisions(params: GetRevisionsMetadataRequestParams): Promise<GetRevisionsMetadataResponse> {
+  async getRevisions(
+    params: GetRevisionsMetadataRequestParams,
+  ): Promise<HttpResponse<GetRevisionsMetadataResponseBody>> {
     const revisionMetadataOrError = await this.getRevisionsMetadata.execute({
       itemUuid: params.itemUuid,
       userUuid: params.userUuid,
@@ -75,7 +77,7 @@ export class RevisionsController {
     }
   }
 
-  async getRevision(params: GetRevisionRequestParams): Promise<GetRevisionResponse> {
+  async getRevision(params: GetRevisionRequestParams): Promise<HttpResponse<GetRevisionResponseBody>> {
     const revisionOrError = await this.doGetRevision.execute({
       revisionUuid: params.revisionUuid,
       userUuid: params.userUuid,
diff --git a/packages/revisions/src/Infra/Http/Response/GetRevisionResponse.ts b/packages/revisions/src/Infra/Http/Response/GetRevisionResponse.ts
deleted file mode 100644
index 3f6bacdb9..000000000
--- a/packages/revisions/src/Infra/Http/Response/GetRevisionResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { GetRevisionResponseBody } from './GetRevisionResponseBody'
-
-export interface GetRevisionResponse extends HttpResponse {
-  data: Either<GetRevisionResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/revisions/src/Infra/Http/Response/GetRevisionsMetadataResponse.ts b/packages/revisions/src/Infra/Http/Response/GetRevisionsMetadataResponse.ts
deleted file mode 100644
index e6df32f2a..000000000
--- a/packages/revisions/src/Infra/Http/Response/GetRevisionsMetadataResponse.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { HttpErrorResponseBody, HttpResponse } from '@standardnotes/api'
-import { Either } from '@standardnotes/common'
-
-import { GetRevisionsMetadataResponseBody } from './GetRevisionsMetadataResponseBody'
-
-export interface GetRevisionsMetadataResponse extends HttpResponse {
-  data: Either<GetRevisionsMetadataResponseBody, HttpErrorResponseBody>
-}
diff --git a/packages/syncing-server/package.json b/packages/syncing-server/package.json
index a029f0b63..1a7bd2e3c 100644
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -31,12 +31,12 @@
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.28.1",
     "@sentry/tracing": "^7.28.1",
-    "@standardnotes/api": "^1.24.10",
+    "@standardnotes/api": "^1.25.3",
     "@standardnotes/common": "workspace:*",
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
-    "@standardnotes/responses": "^1.13.4",
+    "@standardnotes/responses": "^1.13.9",
     "@standardnotes/security": "workspace:*",
     "@standardnotes/settings": "workspace:*",
     "@standardnotes/time": "workspace:*",
diff --git a/packages/websockets/package.json b/packages/websockets/package.json
index fa137be3f..394df354f 100644
--- a/packages/websockets/package.json
+++ b/packages/websockets/package.json
@@ -25,11 +25,12 @@
     "@aws-sdk/client-sqs": "^3.259.0",
     "@newrelic/winston-enricher": "^4.0.0",
     "@sentry/node": "^7.28.1",
-    "@standardnotes/api": "^1.24.10",
+    "@standardnotes/api": "^1.25.3",
     "@standardnotes/common": "workspace:^",
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:^",
     "@standardnotes/domain-events-infra": "workspace:^",
+    "@standardnotes/responses": "^1.13.9",
     "@standardnotes/security": "workspace:^",
     "@standardnotes/utils": "^1.16.2",
     "axios": "^1.1.3",
diff --git a/packages/websockets/src/Controller/WebSocketsController.ts b/packages/websockets/src/Controller/WebSocketsController.ts
index e4ebb0f46..e3b3509de 100644
--- a/packages/websockets/src/Controller/WebSocketsController.ts
+++ b/packages/websockets/src/Controller/WebSocketsController.ts
@@ -1,7 +1,7 @@
+import { HttpStatusCode, HttpResponse } from '@standardnotes/responses'
 import {
-  HttpStatusCode,
   WebSocketConnectionTokenRequestParams,
-  WebSocketConnectionTokenResponse,
+  WebSocketConnectionTokenResponseBody,
   WebSocketServerInterface,
 } from '@standardnotes/api'
 import { inject, injectable } from 'inversify'
@@ -18,7 +18,7 @@ export class WebSocketsController implements WebSocketServerInterface {
 
   async createConnectionToken(
     params: WebSocketConnectionTokenRequestParams,
-  ): Promise<WebSocketConnectionTokenResponse> {
+  ): Promise<HttpResponse<WebSocketConnectionTokenResponseBody>> {
     const result = await this.createWebSocketConnectionToken.execute({ userUuid: params.userUuid as string })
 
     return {
diff --git a/yarn.lock b/yarn.lock
index ec613ce77..e9f743a18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3250,19 +3250,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/api@npm:^1.24.10":
-  version: 1.24.10
-  resolution: "@standardnotes/api@npm:1.24.10"
+"@standardnotes/api@npm:^1.25.3":
+  version: 1.25.3
+  resolution: "@standardnotes/api@npm:1.25.3"
   dependencies:
     "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/domain-core": "npm:^1.11.1"
-    "@standardnotes/encryption": "npm:1.21.9"
-    "@standardnotes/models": "npm:1.42.11"
-    "@standardnotes/responses": "npm:1.13.6"
+    "@standardnotes/domain-core": "npm:^1.11.3"
+    "@standardnotes/encryption": "npm:1.21.17"
+    "@standardnotes/models": "npm:1.43.5"
+    "@standardnotes/responses": "npm:1.13.9"
     "@standardnotes/security": "npm:^1.7.5"
-    "@standardnotes/utils": "npm:1.16.3"
+    "@standardnotes/utils": "npm:1.16.4"
     reflect-metadata: "npm:^0.1.13"
-  checksum: 1b9a97fdd8f2951dac9f9c8d730b23825e4093a3c882004128e618f43de64d1c9050f3de0609bd0ff3999a8bfce2d203a2bce36d2132be3cd42ea7f310509620
+  checksum: bc7953c4402ed3b96ae966717a1d81685e43187d3bdcc640e99256a8342d15901d7bdbd9cb34db99abba18fd86d1bb283bba66506f9a42598d86f11f01dd533d
   languageName: node
   linkType: hard
 
@@ -3279,14 +3279,14 @@ __metadata:
     "@sentry/tracing": "npm:^7.28.1"
     "@simplewebauthn/server": "npm:^7.0.1"
     "@simplewebauthn/typescript-types": "npm:^7.0.0"
-    "@standardnotes/api": "npm:^1.24.10"
+    "@standardnotes/api": "npm:^1.25.3"
     "@standardnotes/common": "workspace:*"
     "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:*"
     "@standardnotes/domain-events-infra": "workspace:*"
     "@standardnotes/features": "npm:^1.58.4"
     "@standardnotes/predicates": "workspace:*"
-    "@standardnotes/responses": "npm:^1.13.4"
+    "@standardnotes/responses": "npm:^1.13.9"
     "@standardnotes/security": "workspace:*"
     "@standardnotes/settings": "workspace:*"
     "@standardnotes/sncrypto-common": "npm:^1.9.0"
@@ -3359,7 +3359,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@standardnotes/domain-core@npm:^1.11.1, @standardnotes/domain-core@workspace:^, @standardnotes/domain-core@workspace:packages/domain-core":
+"@standardnotes/domain-core@npm:^1.11.1, @standardnotes/domain-core@npm:^1.11.3, @standardnotes/domain-core@workspace:^, @standardnotes/domain-core@workspace:packages/domain-core":
   version: 0.0.0-use.local
   resolution: "@standardnotes/domain-core@workspace:packages/domain-core"
   dependencies:
@@ -3412,17 +3412,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/encryption@npm:1.21.9":
-  version: 1.21.9
-  resolution: "@standardnotes/encryption@npm:1.21.9"
+"@standardnotes/encryption@npm:1.21.17":
+  version: 1.21.17
+  resolution: "@standardnotes/encryption@npm:1.21.17"
   dependencies:
     "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/models": "npm:1.42.11"
-    "@standardnotes/responses": "npm:1.13.6"
+    "@standardnotes/models": "npm:1.43.5"
+    "@standardnotes/responses": "npm:1.13.9"
     "@standardnotes/sncrypto-common": "npm:1.13.3"
-    "@standardnotes/utils": "npm:1.16.3"
+    "@standardnotes/utils": "npm:1.16.4"
     reflect-metadata: "npm:^0.1.13"
-  checksum: dc1336cc052780a2b7d59b65c1e86e3ee008bc38ecf50d204514edc36ef0de6a92483cfb00e67bcf7acc541957059db0eb4611feccd3c8eff00ccc05763cf4ab
+  checksum: ece7ac644e1fd8e2a03c9b32a013ee6987b24c4a968ef228dc5bbc6c855518f711467dc63b517f112af71ecfbd28b408816a43d0642bed0bd9d5c336b59dc0ad
   languageName: node
   linkType: hard
 
@@ -3455,7 +3455,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/features@npm:1.58.4, @standardnotes/features@npm:^1.58.4":
+"@standardnotes/features@npm:1.58.8":
+  version: 1.58.8
+  resolution: "@standardnotes/features@npm:1.58.8"
+  dependencies:
+    "@standardnotes/common": "npm:^1.46.4"
+    "@standardnotes/domain-core": "npm:^1.11.3"
+    "@standardnotes/security": "npm:^1.7.5"
+    reflect-metadata: "npm:^0.1.13"
+  checksum: 77bac7d0a024daa0d22d6cebebbccd0f5c1e8356e28670e959424bf0841d1b8ca98c43df45cdccc59ecab704a2bd638dfe629c1806e890d6715e6ab39f930499
+  languageName: node
+  linkType: hard
+
+"@standardnotes/features@npm:^1.58.4":
   version: 1.58.4
   resolution: "@standardnotes/features@npm:1.58.4"
   dependencies:
@@ -3467,18 +3479,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@standardnotes/features@npm:1.58.6":
-  version: 1.58.6
-  resolution: "@standardnotes/features@npm:1.58.6"
-  dependencies:
-    "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/domain-core": "npm:^1.11.1"
-    "@standardnotes/security": "npm:^1.7.5"
-    reflect-metadata: "npm:^0.1.13"
-  checksum: 98550416f1e8fb588611356e9e93b2ff7580b62ceb30251a575a4c4a193519e63fcdcd0d0e06ff10a1184e371a2f673bc81033c9e7f210464917f3c42d45dc7c
-  languageName: node
-  linkType: hard
-
 "@standardnotes/files-server@workspace:packages/files":
   version: 0.0.0-use.local
   resolution: "@standardnotes/files-server@workspace:packages/files"
@@ -3533,16 +3533,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/models@npm:1.42.11":
-  version: 1.42.11
-  resolution: "@standardnotes/models@npm:1.42.11"
+"@standardnotes/models@npm:1.43.5":
+  version: 1.43.5
+  resolution: "@standardnotes/models@npm:1.43.5"
   dependencies:
     "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/features": "npm:1.58.6"
-    "@standardnotes/responses": "npm:1.13.6"
-    "@standardnotes/utils": "npm:^1.16.3"
+    "@standardnotes/features": "npm:1.58.8"
+    "@standardnotes/responses": "npm:1.13.9"
+    "@standardnotes/utils": "npm:^1.16.4"
     lodash: "npm:^4.17.21"
-  checksum: 6ff3409f70b576d97d530df1f597d04a8ca620240fcea6ba477b3b0c3cda9fcfbe5f9a17932543162fececffe02f84bea0e5dbefde790335a912e76ba11e54ef
+  checksum: fd8e3b60bdfcf1d25561082c669a540e4c1938ddb4bbde03b4da391d4639aaf9727d48db7d20f02f885f70d8643921791a916b6c2f3fbc4100e60e5b53445327
   languageName: node
   linkType: hard
 
@@ -3559,27 +3559,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/responses@npm:1.13.6":
-  version: 1.13.6
-  resolution: "@standardnotes/responses@npm:1.13.6"
+"@standardnotes/responses@npm:1.13.9, @standardnotes/responses@npm:^1.13.9":
+  version: 1.13.9
+  resolution: "@standardnotes/responses@npm:1.13.9"
   dependencies:
     "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/features": "npm:1.58.6"
+    "@standardnotes/features": "npm:1.58.8"
     "@standardnotes/security": "npm:^1.7.5"
     reflect-metadata: "npm:^0.1.13"
-  checksum: c57e3e1fa10333c6eaabec4b5c248a9fd8f2631e337113f9f165b30703b4074adebb8e48435786cfaddb63769f0939f167f64ae37b6a93cc156520dbeae795ae
-  languageName: node
-  linkType: hard
-
-"@standardnotes/responses@npm:^1.13.4":
-  version: 1.13.4
-  resolution: "@standardnotes/responses@npm:1.13.4"
-  dependencies:
-    "@standardnotes/common": "npm:^1.46.4"
-    "@standardnotes/features": "npm:1.58.4"
-    "@standardnotes/security": "npm:^1.7.5"
-    reflect-metadata: "npm:^0.1.13"
-  checksum: 4803ee14bd036f8bc3690e3da29ea51d9041f2c283f03b9069e0c7a781e4953002039416f420a88f460157a183a560997d04d4e257ccdbf67981e8fec71dfa88
+  checksum: 5cb5daf9f3c5c402fadbea7a654267d8f9564ad7696f7919e1661a46ac4a1767f44e1b00e97f6e9e79f7a74600559502cdc5250e7eabd1934f632735e7ed1565
   languageName: node
   linkType: hard
 
@@ -3591,11 +3579,12 @@ __metadata:
     "@aws-sdk/client-sqs": "npm:^3.259.0"
     "@newrelic/winston-enricher": "npm:^4.0.0"
     "@sentry/node": "npm:^7.28.1"
-    "@standardnotes/api": "npm:^1.24.10"
+    "@standardnotes/api": "npm:^1.25.3"
     "@standardnotes/common": "workspace:^"
     "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:*"
     "@standardnotes/domain-events-infra": "workspace:*"
+    "@standardnotes/responses": "npm:^1.13.9"
     "@standardnotes/security": "workspace:^"
     "@standardnotes/time": "workspace:^"
     "@types/cors": "npm:^2.8.9"
@@ -3758,12 +3747,12 @@ __metadata:
     "@newrelic/winston-enricher": "npm:^4.0.0"
     "@sentry/node": "npm:^7.28.1"
     "@sentry/tracing": "npm:^7.28.1"
-    "@standardnotes/api": "npm:^1.24.10"
+    "@standardnotes/api": "npm:^1.25.3"
     "@standardnotes/common": "workspace:*"
     "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:*"
     "@standardnotes/domain-events-infra": "workspace:*"
-    "@standardnotes/responses": "npm:^1.13.4"
+    "@standardnotes/responses": "npm:^1.13.9"
     "@standardnotes/security": "workspace:*"
     "@standardnotes/settings": "workspace:*"
     "@standardnotes/time": "workspace:*"
@@ -3821,15 +3810,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@standardnotes/utils@npm:1.16.3, @standardnotes/utils@npm:^1.16.3":
-  version: 1.16.3
-  resolution: "@standardnotes/utils@npm:1.16.3"
+"@standardnotes/utils@npm:1.16.4, @standardnotes/utils@npm:^1.16.4":
+  version: 1.16.4
+  resolution: "@standardnotes/utils@npm:1.16.4"
   dependencies:
     "@standardnotes/common": "npm:^1.46.4"
     dompurify: "npm:^2.4.1"
     lodash: "npm:^4.17.21"
     reflect-metadata: "npm:^0.1.13"
-  checksum: 5c34beaafb732d43ebc4dd170b35c48985c09d6b2c02a817af19d0cfbf868750cfd81a8f8a8aa1d37b872e5c4fce54cd5a942f06008c9b5e1f8f93e903ac52ba
+  checksum: ed29da54cb222f11c4a64ce0618c612a4b16edf180a130434870ca93bffa0278e90b53e14f31f08a0c4fc8852c4267eeadbebb6f41d2184448ccb84d77490a14
   languageName: node
   linkType: hard
 
@@ -3852,11 +3841,12 @@ __metadata:
     "@aws-sdk/client-sqs": "npm:^3.259.0"
     "@newrelic/winston-enricher": "npm:^4.0.0"
     "@sentry/node": "npm:^7.28.1"
-    "@standardnotes/api": "npm:^1.24.10"
+    "@standardnotes/api": "npm:^1.25.3"
     "@standardnotes/common": "workspace:^"
     "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:^"
     "@standardnotes/domain-events-infra": "workspace:^"
+    "@standardnotes/responses": "npm:^1.13.9"
     "@standardnotes/security": "workspace:^"
     "@standardnotes/utils": "npm:^1.16.2"
     "@types/cors": "npm:^2.8.9"