diff --git a/.github/workflows/e2e-home-server.yml b/.github/workflows/e2e-home-server.yml
index 8a6886265..1b245c157 100644
--- a/.github/workflows/e2e-home-server.yml
+++ b/.github/workflows/e2e-home-server.yml
@@ -29,7 +29,6 @@ jobs:
       matrix:
         db_type: [mysql, sqlite]
         cache_type: [redis, memory]
-        secondary_db_enabled: [true, false]
 
     runs-on: ubuntu-latest
 
@@ -51,14 +50,6 @@ jobs:
           MYSQL_DATABASE: standardnotes
           MYSQL_USER: standardnotes
           MYSQL_PASSWORD: standardnotes
-      secondary_db:
-        image: mongo:5.0
-        ports:
-          - 27017:27017
-        env:
-          MONGO_INITDB_ROOT_USERNAME: standardnotes
-          MONGO_INITDB_ROOT_PASSWORD: standardnotes
-          MONGO_INITDB_DATABASE: standardnotes
 
     steps:
     - uses: actions/checkout@v3
@@ -98,12 +89,6 @@ jobs:
         echo "DB_DEBUG_LEVEL=all" >> packages/home-server/.env
         echo "REDIS_URL=redis://localhost:6379" >> packages/home-server/.env
         echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
-        echo "SECONDARY_DB_ENABLED=${{ matrix.secondary_db_enabled }}" >> packages/home-server/.env
-        echo "MONGO_HOST=localhost" >> packages/home-server/.env
-        echo "MONGO_PORT=27017" >> packages/home-server/.env
-        echo "MONGO_DATABASE=standardnotes" >> packages/home-server/.env
-        echo "MONGO_USERNAME=standardnotes" >> packages/home-server/.env
-        echo "MONGO_PASSWORD=standardnotes" >> packages/home-server/.env
         echo "FILES_SERVER_URL=http://localhost:3123" >> packages/home-server/.env
         echo "E2E_TESTING=true" >> packages/home-server/.env
 
@@ -122,7 +107,7 @@ jobs:
       if: ${{ failure() }}
       uses: actions/upload-artifact@v3
       with:
-        name: home-server-failure-logs-${{ inputs.suite }}-${{ matrix.db_type }}-${{ matrix.cache_type }}-${{ matrix.secondary_db_enabled }}
+        name: home-server-failure-logs-${{ inputs.suite }}-${{ matrix.db_type }}-${{ matrix.cache_type }}
         retention-days: 5
         path: |
           logs/output.log
diff --git a/.github/workflows/e2e-self-hosted.yml b/.github/workflows/e2e-self-hosted.yml
index f87df8c0f..3bf38f3dc 100644
--- a/.github/workflows/e2e-self-hosted.yml
+++ b/.github/workflows/e2e-self-hosted.yml
@@ -26,8 +26,6 @@ jobs:
     name: (Self Hosting) E2E Test Suite
     strategy:
       fail-fast: false
-      matrix:
-        secondary_db_enabled: [true, false]
     runs-on: ubuntu-latest
 
     services:
@@ -53,7 +51,6 @@ jobs:
       env:
         DB_TYPE: mysql
         CACHE_TYPE: redis
-        SECONDARY_DB_ENABLED: ${{ matrix.secondary_db_enabled }}
 
     - name: Wait for server to start
       run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
@@ -65,7 +62,7 @@ jobs:
       if: ${{ failure() }}
       uses: actions/upload-artifact@v3
       with:
-        name: self-hosted-failure-logs-${{ inputs.suite }}-${{ matrix.secondary_db_enabled }}
+        name: self-hosted-failure-logs-${{ inputs.suite }}
         retention-days: 5
         path: |
           logs/*.err
diff --git a/.github/workflows/e2e-test-suite.yml b/.github/workflows/e2e-test-suite.yml
index 08602625c..d5d6a7e9a 100644
--- a/.github/workflows/e2e-test-suite.yml
+++ b/.github/workflows/e2e-test-suite.yml
@@ -13,7 +13,7 @@ on:
         description: The Docker image tag used for SNJS container
       suite:
         type: string
-        default: base
+        default: all
         description: The test suite to run
       author:
         type: string
@@ -30,5 +30,5 @@ jobs:
     uses: standardnotes/server/.github/workflows/common-e2e.yml@main
     with:
       snjs_image_tag: ${{ inputs.snjs_image_tag || 'latest' }}
-      suite: ${{ inputs.suite || 'base' }}
+      suite: ${{ inputs.suite || 'all' }}
     secrets: inherit