chore(release): 1.53.1 [skip ci]

chore(release): automatic release v1.53.1
fix(seerr): use reasonable limits for amount of returned entries (#5001 )
2026-02-13 19:42:07 +00:00 · 2026-02-13 19:41:04 +00:00 · 2026-02-13 19:23:35 +01:00 · 2026-02-13 15:49:24 +00:00 · 2026-02-13 15:43:48 +01:00 · 2026-02-13 13:09:10 +00:00
172 changed files with 10222 additions and 5370 deletions
@@ -5,6 +5,7 @@ node_modules
 npm-debug.log
 README.md
 .next
+.turbo
 .git
 dev
 .build
@@ -33,6 +33,12 @@ body:
      options:
        # The below comment is used to insert a new version with on-release.yml
        #NEXT_VERSION#
+        - 1.53.0
+        - 1.52.0
+        - 1.51.0
+        - 1.50.1
+        - 1.50.0
+        - 1.49.1
        - 1.49.0
        - 1.48.0
        - 1.47.0
@@ -19,6 +19,11 @@ inputs:
 runs:
  using: "composite"
  steps:
+    - name: Prebuilt debian dependencies
+      uses: homarr-labs/homarr/.github/actions/prebuilt-debian@dev
+      id: prebuilt-debian
+      with:
+        architecture: ${{ inputs.architecture }}
    - name: Start docker container for ${{ inputs.architecture }}
      run: |
        docker run --name homarr \
@@ -36,9 +41,12 @@ runs:
        docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \
        docker exec homarr rm /app/extraction-alpine.tar.gz
      shell: bash
-    - name: Copy source for debian build artifact
+    - name: Extract source from ${{ inputs.architecture }} container (debian)
      run: |
-        cp ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
+        docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/build && \
+        docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/node_modules/better-sqlite3/build/Release && \
+        docker exec homarr tar -czf extraction-debian.tar.gz -C /app . && \
+        docker cp homarr:/app/extraction-debian.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
      shell: bash
    - name: Stop ${{ inputs.architecture }} container
      if: always()
@@ -0,0 +1,42 @@
+name: Prebuilt dependencies for debian
+description: Provides prebuilt dependencies for debian based docker images
+inputs:
+  architecture:
+    description: Name of architecture, will be used to build docker image (e.g. amd64, arm64)
+    required: true
+outputs:
+  path:
+    description: Path to extracted prebuilt dependencies
+    value: ${{ runner.temp }}/prebuilts
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build docker image for ${{ inputs.architecture }}
+      id: build
+      uses: docker/build-push-action@v6
+      with:
+        push: false
+        load: true
+        context: ./deployments/prebuilt-debian
+        platforms: linux/${{ inputs.architecture }}
+        tags: prebuilt-debian
+    - name: Start docker container for ${{ inputs.architecture }}
+      run: |
+        docker run --name prebuilt-debian \
+          --detach --rm prebuilt-debian
+      shell: bash
+    - name: Extract prebuilt dependencies from ${{ inputs.architecture }} container
+      run: |
+        mkdir -p ${{ runner.temp }}/prebuilts && \
+        docker cp prebuilt-debian:/app/node_modules/better-sqlite3/build/Release/better_sqlite3.node ${{ runner.temp }}/prebuilts/better_sqlite3.node
+      shell: bash
+    - name: Stop ${{ inputs.architecture }} container
+      if: always()
+      run: docker container remove --force --volumes prebuilt-debian
+      shell: bash
@@ -20,6 +20,7 @@
      matchPackageNames: [
        "@tree-sitter-grammars/tree-sitter-yaml",
        "bcrypt",
+        "better-sqlite3",
        "cpu-features",
        "esbuild",
        "sharp",
@@ -65,7 +65,7 @@ jobs:
      - uses: actions/setup-node@v6
        if: env.SKIP_RELEASE == 'false'
        with:
-          node-version: 24.12.0
+          node-version: 24.13.0
          cache: "pnpm"
      - run: npm i -g pnpm
        if: env.SKIP_RELEASE == 'false'
@@ -0,0 +1,45 @@
+name: "[Deployments] Validate prebuilt debian dependencies"
+
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    branches: ["*"]
+    paths: [".github/actions/prebuilt-debian/**", "deployments/prebuilt-debian/**"]
+
+jobs:
+  prebuilt-debian-validate-amd64:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v6
+      - name: Validate prebuilt dependencies for amd64
+        id: validate-amd64
+        uses: ./.github/actions/prebuilt-debian
+        with:
+          architecture: amd64
+
+      - name: Check extracted files for amd64
+        run: |
+          if [ ! -f "${{ steps.validate-amd64.outputs.path }}/better_sqlite3.node" ]; then
+            echo "better_sqlite3.node not found for amd64!"
+            exit 1
+          fi
+  prebuilt-debian-validate-arm64:
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v6
+      - name: Validate prebuilt dependencies for arm64
+        id: validate-arm64
+        uses: ./.github/actions/prebuilt-debian
+        with:
+          architecture: arm64
+
+      - name: Check extracted files for arm64
+        run: |
+          if [ ! -f "${{ steps.validate-arm64.outputs.path }}/better_sqlite3.node" ]; then
+            echo "better_sqlite3.node not found for arm64!"
+            exit 1
+          fi
@@ -2,7 +2,7 @@ permissions: {}

 on:
  release:
-    types: [published]
+    types: [released]

 jobs:
  trigger-docs-release:
@@ -37,6 +37,7 @@ jobs:
            }
          }
          EOF
+
  update-bug-report-template:
    name: Update Bug Report Template
    runs-on: ubuntu-latest
@@ -54,23 +55,20 @@ jobs:
        uses: actions/checkout@v6
        with:
          token: ${{ steps.obtainToken.outputs.token }}
+          ref: dev
      - name: Setup
        uses: ./tooling/github/setup
      - run: pnpm run scripts:update-bug-report-template
        env:
          NEXT_VERSION: ${{ github.event.release.tag_name }}
-      - name: Commit changes
-        run: |
-          git config --global user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
-          git config --global user.name "Releases Homarr"
-          git checkout -b update-bug-report-template
-          git add .
-          git commit -m "chore: update bug report template"

      - name: Create Pull Request
        id: create-pull-request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
+          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
+          commit-message: "chore: update bug report template"
+          author: Releases Homarr <175486441+homarr-releases[bot]@users.noreply.github.com>
          token: ${{ steps.obtainToken.outputs.token }}
          branch: update-bug-report-template
          base: dev
@@ -1 +1 @@
-24.12.0
+24.13.0
@@ -1,3 +1,109 @@
+## [1.53.1](https://github.com/homarr-labs/homarr/compare/v1.53.0...v1.53.1) (2026-02-13)
+
+### Bug Fixes
+
+* **deps:** update dependency @ianvs/prettier-plugin-sort-imports to ^4.7.1 ([#5021](https://github.com/homarr-labs/homarr/issues/5021)) ([5946e6c](https://github.com/homarr-labs/homarr/commit/5946e6c7193eded77b98c76aedff71a7bb912574))
+* **deps:** update dependency @octokit/auth-app to ^8.2.0 ([#5009](https://github.com/homarr-labs/homarr/issues/5009)) ([4a86361](https://github.com/homarr-labs/homarr/commit/4a86361134da404462b1a9f8ff98fe3504fade0d))
+* **deps:** update dependency dotenv to ^17.2.4 ([#5029](https://github.com/homarr-labs/homarr/issues/5029)) ([e8c7f45](https://github.com/homarr-labs/homarr/commit/e8c7f454768044540ee37d75fc73654b74315390))
+* **deps:** update dependency fast-xml-parser to ^5.3.5 ([#5050](https://github.com/homarr-labs/homarr/issues/5050)) ([30f561f](https://github.com/homarr-labs/homarr/commit/30f561f85ad2abb90ccb9fa3292155d51f1f379b))
+* **deps:** update dependency fastify to ^5.7.4 ([#5027](https://github.com/homarr-labs/homarr/issues/5027)) ([18e16d6](https://github.com/homarr-labs/homarr/commit/18e16d687f8137e5b5c55cf2385436b714a2d27b))
+* **deps:** update dependency glob to ^13.0.1 ([#5013](https://github.com/homarr-labs/homarr/issues/5013)) ([3b21c3e](https://github.com/homarr-labs/homarr/commit/3b21c3ef765add0f7cdc8f66ae8f1b7aac3cf51e))
+* **deps:** update dependency isomorphic-dompurify to ^2.36.0 ([#5041](https://github.com/homarr-labs/homarr/issues/5041)) ([e561fc5](https://github.com/homarr-labs/homarr/commit/e561fc550fab2207212ae108a5177a248795cf66))
+* **deps:** update dependency jotai to ^2.17.1 ([#5019](https://github.com/homarr-labs/homarr/issues/5019)) ([da96566](https://github.com/homarr-labs/homarr/commit/da965668d021ebebd8c8a7e2a4560577a6b0828b))
+* **deps:** update dependency ldapts to v8.1.5 ([#5004](https://github.com/homarr-labs/homarr/issues/5004)) ([c3932b1](https://github.com/homarr-labs/homarr/commit/c3932b18f03b86e8ee049c14ace63119fd2ab0d6))
+* **deps:** update dependency ldapts to v8.1.6 ([#5018](https://github.com/homarr-labs/homarr/issues/5018)) ([c92d487](https://github.com/homarr-labs/homarr/commit/c92d487ceaa9159579ef4352d763429887953bb5))
+* **deps:** update dependency mysql2 to v3.16.3 ([#5014](https://github.com/homarr-labs/homarr/issues/5014)) ([04b3598](https://github.com/homarr-labs/homarr/commit/04b35980f5997e744a455a847f28b1a676f9861e))
+* **deps:** update dependency next-intl to v4.8.2 ([#5005](https://github.com/homarr-labs/homarr/issues/5005)) ([b67fecd](https://github.com/homarr-labs/homarr/commit/b67fecd3963bc3112ab8ecd91385bbe13c982290))
+* **deps:** update dependency tsdav to ^2.1.7 ([#5033](https://github.com/homarr-labs/homarr/issues/5033)) ([d694b1a](https://github.com/homarr-labs/homarr/commit/d694b1a5410833a791d57fb3dd4650003510140e))
+* **deps:** update dependency video.js to ^8.23.7 ([#5034](https://github.com/homarr-labs/homarr/issues/5034)) ([6efabd4](https://github.com/homarr-labs/homarr/commit/6efabd436849b9fdea0d060fe7beaa9c67424c29))
+* **deps:** update tiptap monorepo to v3.19.0 ([#5012](https://github.com/homarr-labs/homarr/issues/5012)) ([ad41a91](https://github.com/homarr-labs/homarr/commit/ad41a918ef72f322015a02e9601c43728e680b34))
+* **deps:** update turbo monorepo to ^2.8.2 ([#5010](https://github.com/homarr-labs/homarr/issues/5010)) ([b479fea](https://github.com/homarr-labs/homarr/commit/b479fea6eb0b025b55668201160a5e57267de2e7))
+* **deps:** update turbo monorepo to ^2.8.3 ([#5016](https://github.com/homarr-labs/homarr/issues/5016)) ([f1d2f07](https://github.com/homarr-labs/homarr/commit/f1d2f07f3888e7567b56ae61a9d137255a2b8529))
+* **sections:** dynamic sections vanish when adding category ([#5046](https://github.com/homarr-labs/homarr/issues/5046)) ([60fcb71](https://github.com/homarr-labs/homarr/commit/60fcb71bd2616af3e99b20cbbcd1b0417a0fff76))
+* **seerr:** use reasonable limits for amount of returned entries ([#5001](https://github.com/homarr-labs/homarr/issues/5001)) ([be1a26a](https://github.com/homarr-labs/homarr/commit/be1a26a98d2ed9d25969ded5ae64705c001f71dd))
+
+## [1.53.0](https://github.com/homarr-labs/homarr/compare/v1.52.0...v1.53.0) (2026-02-06)
+
+### Features
+
+* **analytics:** consolidate server analytics into single comprehensive Umami event ([#4938](https://github.com/homarr-labs/homarr/issues/4938)) ([10848db](https://github.com/homarr-labs/homarr/commit/10848db595b2254b1485ea168d1c327b907d9ff8))
+
+### Bug Fixes
+
+* **deps:** update dependency @next/eslint-plugin-next to v16.1.5 ([#4959](https://github.com/homarr-labs/homarr/issues/4959)) ([ec40309](https://github.com/homarr-labs/homarr/commit/ec40309cde2280cf689856d4f78fb1500b583130))
+* **deps:** update dependency @paralleldrive/cuid2 to ^3.3.0 ([#4952](https://github.com/homarr-labs/homarr/issues/4952)) ([a9db68b](https://github.com/homarr-labs/homarr/commit/a9db68bd3eaea6a4564cd6842054ea60cc45e3a3))
+* **deps:** update dependency @tanstack/react-query-devtools to ^5.91.3 ([#4985](https://github.com/homarr-labs/homarr/issues/4985)) ([1115ad1](https://github.com/homarr-labs/homarr/commit/1115ad1364bca84dee33aa42499c986bdad2c528))
+* **deps:** update dependency fast-xml-parser to ^5.3.4 ([#4982](https://github.com/homarr-labs/homarr/issues/4982)) ([460d53c](https://github.com/homarr-labs/homarr/commit/460d53cafa1abeebf4dea7b1bb1e920267c2f9fe))
+* **deps:** update dependency fastify to ^5.7.2 ([#4955](https://github.com/homarr-labs/homarr/issues/4955)) ([0eab26c](https://github.com/homarr-labs/homarr/commit/0eab26cdace47c0b19519372a3daa6998e0c8207))
+* **deps:** update dependency jotai to ^2.17.0 ([#4972](https://github.com/homarr-labs/homarr/issues/4972)) ([e67483f](https://github.com/homarr-labs/homarr/commit/e67483fea56f0b06fa54e68b8dd62fd0b5dedadd))
+* **deps:** update dependency ldapts to v8.1.4 ([#4993](https://github.com/homarr-labs/homarr/issues/4993)) ([c2d9f18](https://github.com/homarr-labs/homarr/commit/c2d9f18e4ef28f063e4abf1175cd90ba746410b7))
+* **deps:** update dependency mysql2 to v3.16.2 ([#4961](https://github.com/homarr-labs/homarr/issues/4961)) ([5c6eafb](https://github.com/homarr-labs/homarr/commit/5c6eafb272436b78d4668d562d50001bca48e6d3))
+* **deps:** update dependency next-intl to v4.8.0 ([#4977](https://github.com/homarr-labs/homarr/issues/4977)) ([c3a7ab5](https://github.com/homarr-labs/homarr/commit/c3a7ab52ee3acbcf47255d5813317c3cf67ea49f))
+* **deps:** update dependency next-intl to v4.8.1 ([#4986](https://github.com/homarr-labs/homarr/issues/4986)) ([62b6939](https://github.com/homarr-labs/homarr/commit/62b6939b92f29618cc6d13a189b65df1922779ba))
+* **deps:** update dependency pg to ^8.18.0 ([#4989](https://github.com/homarr-labs/homarr/issues/4989)) ([c3071a3](https://github.com/homarr-labs/homarr/commit/c3071a3c95f3a30438050aa37c65950cccabf681))
+* **deps:** update dependency typescript-eslint to ^8.54.0 ([#4958](https://github.com/homarr-labs/homarr/issues/4958)) ([e88d126](https://github.com/homarr-labs/homarr/commit/e88d126355b96ac5060b552047c191f8b284461c))
+* **deps:** update dependency video.js to ^8.23.6 ([#4992](https://github.com/homarr-labs/homarr/issues/4992)) ([4209f7c](https://github.com/homarr-labs/homarr/commit/4209f7c70e75870f56b93a97f3b6053962ee3ff7))
+* **deps:** update mantine monorepo to ^8.3.14 ([#4998](https://github.com/homarr-labs/homarr/issues/4998)) ([0fafa50](https://github.com/homarr-labs/homarr/commit/0fafa505ac1c7f4ddb33ee5e8dedca9a883164ba))
+* **deps:** update nextjs monorepo to v16.1.6 ([#4969](https://github.com/homarr-labs/homarr/issues/4969)) ([7c3fe3d](https://github.com/homarr-labs/homarr/commit/7c3fe3d6d47879c67950b3dc4d7e39adbc06c146))
+* **deps:** update react monorepo to v19.2.4 ([#4960](https://github.com/homarr-labs/homarr/issues/4960)) ([d3e0b47](https://github.com/homarr-labs/homarr/commit/d3e0b47875998fc766e1c5f0481244fc659b0c49))
+* **deps:** update tiptap monorepo to v3.18.0 ([#4975](https://github.com/homarr-labs/homarr/issues/4975)) ([24e24dc](https://github.com/homarr-labs/homarr/commit/24e24dc634a9e5a25ab934541225996e62ac31be))
+* **deps:** update trpc monorepo to ^11.9.0 ([#4970](https://github.com/homarr-labs/homarr/issues/4970)) ([aeb6e0f](https://github.com/homarr-labs/homarr/commit/aeb6e0f40659bf1c514380a6c96858afdaf7e6db))
+* **deps:** update turbo monorepo to ^2.8.0 ([#4978](https://github.com/homarr-labs/homarr/issues/4978)) ([054ca57](https://github.com/homarr-labs/homarr/commit/054ca57188656ddac7aaa16f792269eaa2ef319b))
+* **deps:** update turbo monorepo to ^2.8.1 ([#4991](https://github.com/homarr-labs/homarr/issues/4991)) ([43b6246](https://github.com/homarr-labs/homarr/commit/43b6246876debccbe7239c8ee67753e17527e469))
+
+## [1.52.0](https://github.com/homarr-labs/homarr/compare/v1.51.0...v1.52.0) (2026-01-30)
+
+### Features
+
+* **installations:** support docker secrets file for encryption key ([#4946](https://github.com/homarr-labs/homarr/issues/4946)) ([9ba8213](https://github.com/homarr-labs/homarr/commit/9ba82133da2ae472952358f84d8ee1758c0f108a))
+
+### Bug Fixes
+
+* **deps:** update dependency @tanstack/react-query to ^5.90.20 ([#4939](https://github.com/homarr-labs/homarr/issues/4939)) ([840940b](https://github.com/homarr-labs/homarr/commit/840940bab663e728b8516ac48f913fef2b5c61b7))
+* **deps:** update dependency next to v16.1.5 [security] ([#4937](https://github.com/homarr-labs/homarr/issues/4937)) ([aeb1df1](https://github.com/homarr-labs/homarr/commit/aeb1df122926c7bed71bea9b21f1c42c45cc9b3e))
+* **deps:** update dependency pg to ^8.17.2 ([#4916](https://github.com/homarr-labs/homarr/issues/4916)) ([a50a29a](https://github.com/homarr-labs/homarr/commit/a50a29a778689efcca0afc2b640fdb497e6e7d98))
+* **deps:** update dependency prettier to ^3.8.1 ([#4925](https://github.com/homarr-labs/homarr/issues/4925)) ([a727b8e](https://github.com/homarr-labs/homarr/commit/a727b8e323b9fb7cba536909a51fabde0a992a69))
+* **deps:** update dependency sass to ^1.97.3 ([#4927](https://github.com/homarr-labs/homarr/issues/4927)) ([b1658a5](https://github.com/homarr-labs/homarr/commit/b1658a5d01b5c12f391af9d326ec98b3da000f9e))
+* **deps:** update dependency typescript-eslint to ^8.53.1 ([#4904](https://github.com/homarr-labs/homarr/issues/4904)) ([c58da00](https://github.com/homarr-labs/homarr/commit/c58da0095738352515d6d8c5e81b3c34c8726ffe))
+* **deps:** update mantine monorepo to ^8.3.13 ([#4911](https://github.com/homarr-labs/homarr/issues/4911)) ([f2eec74](https://github.com/homarr-labs/homarr/commit/f2eec748494480e773b45a309aa89ae3862e2b05))
+* **deps:** update nextjs monorepo to v16.1.4 ([#4909](https://github.com/homarr-labs/homarr/issues/4909)) ([99a2574](https://github.com/homarr-labs/homarr/commit/99a2574d80ad5a7dfe3b9c92d43bd4b9423bf22d))
+* **deps:** update tiptap monorepo to v3.16.0 ([#4912](https://github.com/homarr-labs/homarr/issues/4912)) ([2354510](https://github.com/homarr-labs/homarr/commit/23545101b61e456fd886eedb4b3d86b8cc606639))
+* **deps:** update tiptap monorepo to v3.17.0 ([#4940](https://github.com/homarr-labs/homarr/issues/4940)) ([d030261](https://github.com/homarr-labs/homarr/commit/d03026187cb6451d727167b02ac138f9c7ccc754))
+* **deps:** update tiptap monorepo to v3.17.1 ([#4945](https://github.com/homarr-labs/homarr/issues/4945)) ([b354085](https://github.com/homarr-labs/homarr/commit/b354085c7adfb6e5f3cad51b5b825426e072e874))
+* **deps:** update turbo monorepo to ^2.7.6 ([#4947](https://github.com/homarr-labs/homarr/issues/4947)) ([e078237](https://github.com/homarr-labs/homarr/commit/e078237e31d11029987c6c4370fd8f65023b87bc))
+
+## [1.51.0](https://github.com/homarr-labs/homarr/compare/v1.50.1...v1.51.0) (2026-01-23)
+
+### Features
+
+* **integrations:** add Coolify integration and widget ([#4789](https://github.com/homarr-labs/homarr/issues/4789)) ([81dac58](https://github.com/homarr-labs/homarr/commit/81dac580050a86e34135beef09b876089777f1c7))
+* **widgets:** add disks widget ([#4445](https://github.com/homarr-labs/homarr/issues/4445)) ([62caa71](https://github.com/homarr-labs/homarr/commit/62caa71a48c38f59f109666e83f26019586a5ca0))
+
+### Bug Fixes
+
+* **deps:** update dependency @tanstack/react-query to ^5.90.17 ([#4873](https://github.com/homarr-labs/homarr/issues/4873)) ([624bd55](https://github.com/homarr-labs/homarr/commit/624bd55b117b2b9f9109aecdeabf1515c567656e))
+* **deps:** update dependency @tanstack/react-query to ^5.90.19 ([#4888](https://github.com/homarr-labs/homarr/issues/4888)) ([fa84bd5](https://github.com/homarr-labs/homarr/commit/fa84bd569fdf6c9aecfcb9b4d8fb20d14215160b))
+* **deps:** update dependency better-sqlite3 to ^12.6.0 ([#4853](https://github.com/homarr-labs/homarr/issues/4853)) ([9d4fb9e](https://github.com/homarr-labs/homarr/commit/9d4fb9eb462a0297618c70f619618f94d8857e1f))
+* **deps:** update dependency better-sqlite3 to ^12.6.2 ([#4891](https://github.com/homarr-labs/homarr/issues/4891)) ([63a0793](https://github.com/homarr-labs/homarr/commit/63a0793c6ea02456a49a07635b927adf3a314ee0))
+* **deps:** update dependency fastify to ^5.7.0 ([#4882](https://github.com/homarr-labs/homarr/issues/4882)) ([b9bc9dd](https://github.com/homarr-labs/homarr/commit/b9bc9dd38d22f03a0faa59a68056192c3f1519d4))
+* **deps:** update dependency fastify to ^5.7.1 ([#4887](https://github.com/homarr-labs/homarr/issues/4887)) ([02e722a](https://github.com/homarr-labs/homarr/commit/02e722aa4531e816bb563628ebbb7e8b0cf93ce3))
+* **deps:** update dependency ioredis to v5.9.2 ([#4881](https://github.com/homarr-labs/homarr/issues/4881)) ([e3ba1ee](https://github.com/homarr-labs/homarr/commit/e3ba1ee931b0e53fb94bf0e50fae81eecfade237))
+* **deps:** update dependency jotai to ^2.16.2 ([#4869](https://github.com/homarr-labs/homarr/issues/4869)) ([2e58acc](https://github.com/homarr-labs/homarr/commit/2e58acc3bd5da474bfe0636a58b43759947ef2d2))
+* **deps:** update dependency mysql2 to v3.16.1 ([#4886](https://github.com/homarr-labs/homarr/issues/4886)) ([40ee667](https://github.com/homarr-labs/homarr/commit/40ee667832124075b0730a54a4b8019365ab8794))
+* **deps:** update dependency pg to ^8.17.0 ([#4874](https://github.com/homarr-labs/homarr/issues/4874)) ([b923891](https://github.com/homarr-labs/homarr/commit/b923891fac4cd61c5a1a8505d5bcfb737255196f))
+* **deps:** update dependency pg to ^8.17.1 ([#4877](https://github.com/homarr-labs/homarr/issues/4877)) ([fcd4171](https://github.com/homarr-labs/homarr/commit/fcd417198f4a1afc250455bf25594a32f61b1070))
+* **deps:** update dependency prettier to ^3.8.0 ([#4876](https://github.com/homarr-labs/homarr/issues/4876)) ([3ade915](https://github.com/homarr-labs/homarr/commit/3ade915d35540578a7f193baf99cbdbf89103b97))
+* **deps:** update dependency react-error-boundary to ^6.1.0 ([#4884](https://github.com/homarr-labs/homarr/issues/4884)) ([41b02b6](https://github.com/homarr-labs/homarr/commit/41b02b63d9a1f9b73cc54371bbc1b6161a4d76d0))
+* **deps:** update dependency typescript-eslint to ^8.53.0 ([#4863](https://github.com/homarr-labs/homarr/issues/4863)) ([e9020e6](https://github.com/homarr-labs/homarr/commit/e9020e68ecf9e33df983108e7ab239776874413c))
+* **deps:** update nextjs monorepo to v16.1.2 ([#4875](https://github.com/homarr-labs/homarr/issues/4875)) ([c6be8c5](https://github.com/homarr-labs/homarr/commit/c6be8c5475722e5a6dbc886e5e7f24ef8a04c470))
+* **deps:** update nextjs monorepo to v16.1.3 ([#4889](https://github.com/homarr-labs/homarr/issues/4889)) ([5a8e864](https://github.com/homarr-labs/homarr/commit/5a8e864630b61595b53a9e849973460ffdce5fd2))
+* **deps:** update turbo monorepo to ^2.7.4 ([#4861](https://github.com/homarr-labs/homarr/issues/4861)) ([0c38e2f](https://github.com/homarr-labs/homarr/commit/0c38e2f290fc6dcb9608b338ee38409afb3beabe))
+* **deps:** update turbo monorepo to ^2.7.5 ([#4892](https://github.com/homarr-labs/homarr/issues/4892)) ([c847f60](https://github.com/homarr-labs/homarr/commit/c847f6004dc4c166969ee1248ec64b7d27ba8362))
+
+### Performance Improvements
+
+* **memory:** lazy routers ([#4868](https://github.com/homarr-labs/homarr/issues/4868)) ([1623fba](https://github.com/homarr-labs/homarr/commit/1623fbaaeb41b16e13dcd401a00f70711a283bf9))
+
 ## [1.50.1](https://github.com/homarr-labs/homarr/compare/v1.50.0...v1.50.1) (2026-01-16)

 ### Bug Fixes
@@ -1,4 +1,4 @@
-FROM node:24.12.0-alpine AS base
+FROM node:24.13.0-alpine AS base

 FROM base AS builder
 RUN apk add --no-cache libc6-compat
@@ -45,6 +45,7 @@ COPY --from=builder /app/apps/nextjs/package.json .

 COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs
 COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs
+COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node

 COPY --from=builder /app/packages/db/migrations ./db/migrations

@@ -48,21 +48,21 @@
    "@homarr/ui": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
    "@homarr/widgets": "workspace:^0.1.0",
-    "@mantine/colors-generator": "^8.3.12",
-    "@mantine/core": "^8.3.12",
-    "@mantine/dropzone": "^8.3.12",
-    "@mantine/hooks": "^8.3.12",
-    "@mantine/modals": "^8.3.12",
-    "@mantine/tiptap": "^8.3.12",
+    "@mantine/colors-generator": "^8.3.14",
+    "@mantine/core": "^8.3.14",
+    "@mantine/dropzone": "^8.3.14",
+    "@mantine/hooks": "^8.3.14",
+    "@mantine/modals": "^8.3.14",
+    "@mantine/tiptap": "^8.3.14",
    "@million/lint": "1.0.14",
    "@tabler/icons-react": "^3.36.1",
-    "@tanstack/react-query": "^5.90.16",
-    "@tanstack/react-query-devtools": "^5.91.2",
+    "@tanstack/react-query": "^5.90.20",
+    "@tanstack/react-query-devtools": "^5.91.3",
    "@tanstack/react-query-next-experimental": "^5.91.0",
-    "@trpc/client": "^11.8.1",
-    "@trpc/next": "^11.8.1",
-    "@trpc/react-query": "^11.8.1",
-    "@trpc/server": "^11.8.1",
+    "@trpc/client": "^11.9.0",
+    "@trpc/next": "^11.9.0",
+    "@trpc/react-query": "^11.9.0",
+    "@trpc/server": "^11.9.0",
    "@xterm/addon-canvas": "^0.7.0",
    "@xterm/addon-fit": "0.11.0",
    "@xterm/xterm": "^6.0.0",
@@ -70,20 +70,20 @@
    "chroma-js": "^3.2.0",
    "clsx": "^2.1.1",
    "dayjs": "^1.11.19",
-    "dotenv": "^17.2.3",
+    "dotenv": "^17.2.4",
    "flag-icons": "^7.5.0",
-    "glob": "^13.0.0",
-    "isomorphic-dompurify": "^2.35.0",
-    "jotai": "^2.16.1",
+    "glob": "^13.0.1",
+    "isomorphic-dompurify": "^2.36.0",
+    "jotai": "^2.17.1",
    "mantine-react-table": "2.0.0-beta.9",
-    "next": "16.1.1",
+    "next": "16.1.6",
    "postcss-preset-mantine": "^1.18.0",
    "prismjs": "^1.30.0",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "react-error-boundary": "^6.0.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "react-error-boundary": "^6.1.0",
    "react-simple-code-editor": "^0.14.1",
-    "sass": "^1.97.2",
+    "sass": "^1.97.3",
    "superjson": "2.2.6",
    "swagger-ui-react": "^5.31.0",
    "use-deep-compare-effect": "^1.8.1",
@@ -94,15 +94,15 @@
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
    "@types/chroma-js": "3.1.2",
-    "@types/node": "^24.10.7",
+    "@types/node": "^24.10.12",
    "@types/prismjs": "^1.26.5",
-    "@types/react": "19.2.8",
+    "@types/react": "19.2.13",
    "@types/react-dom": "19.2.3",
    "@types/swagger-ui-react": "^5.18.0",
    "concurrently": "^9.2.1",
    "eslint": "^9.39.2",
    "node-loader": "^2.1.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "typescript": "^5.9.3"
  }
 }
@@ -1,6 +1,5 @@
 "use client";

-import { startTransition } from "react";
 import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
 import type { z } from "zod/v4";
@@ -24,16 +23,6 @@ export const InitSettings = () => {
  });
  const form = useZodForm(settingsInitSchema, { initialValues: defaultServerSettings });

-  form.watch("analytics.enableGeneral", ({ value }) => {
-    if (!value) {
-      startTransition(() => {
-        form.setFieldValue("analytics.enableWidgetData", false);
-        form.setFieldValue("analytics.enableIntegrationData", false);
-        form.setFieldValue("analytics.enableUserData", false);
-      });
-    }
-  });
-
  const handleSubmitAsync = async (values: z.infer<typeof settingsInitSchema>) => {
    await mutateAsync(values);
  };
@@ -47,24 +36,6 @@ export const InitSettings = () => {

            <Stack gap="xs">
              <AnalyticsRow kind="general" {...form.getInputProps("analytics.enableGeneral", { type: "checkbox" })} />
-
-              <Stack gap="xs" ps="md" w="100%">
-                <AnalyticsRow
-                  kind="integrationData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableWidgetData", { type: "checkbox" })}
-                />
-                <AnalyticsRow
-                  kind="widgetData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableIntegrationData", { type: "checkbox" })}
-                />
-                <AnalyticsRow
-                  kind="usersData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableUserData", { type: "checkbox" })}
-                />
-              </Stack>
            </Stack>
          </Stack>
        </Card>
@@ -24,15 +24,6 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
        return;
      }

-      if (
-        !updatedValues.enableGeneral &&
-        (updatedValues.enableWidgetData || updatedValues.enableIntegrationData || updatedValues.enableUserData)
-      ) {
-        updatedValues.enableIntegrationData = false;
-        updatedValues.enableUserData = false;
-        updatedValues.enableWidgetData = false;
-      }
-
      void mutateAsync({
        settingsKey: "analytics",
        value: updatedValues,
@@ -54,30 +45,6 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
        <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
        <Stack>
          <SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
-          <SwitchSetting
-            form={form}
-            formKey="enableIntegrationData"
-            ms="xl"
-            title={t("integrationData.title")}
-            text={t("integrationData.text")}
-            disabled={!form.values.enableGeneral}
-          />
-          <SwitchSetting
-            form={form}
-            formKey="enableWidgetData"
-            ms="xl"
-            title={t("widgetData.title")}
-            text={t("widgetData.text")}
-            disabled={!form.values.enableGeneral}
-          />
-          <SwitchSetting
-            form={form}
-            formKey="enableUserData"
-            ms="xl"
-            title={t("usersData.title")}
-            text={t("usersData.text")}
-            disabled={!form.values.enableGeneral}
-          />
        </Stack>
      </Card>
    </>
@@ -105,7 +105,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
            <ErrorBoundary
              onReset={reset}
              fallbackRender={({ resetErrorBoundary, error }) => (
-                <WidgetError kind={kind} error={error as unknown} resetErrorBoundary={resetErrorBoundary} />
+                <WidgetError kind={kind} error={error} resetErrorBoundary={resetErrorBoundary} />
              )}
            >
              <Comp
@@ -108,7 +108,7 @@ const InnerContent = ({ item, ...dimensions }: InnerContentProps) => {
          fallbackRender={({ resetErrorBoundary, error }) => (
            <>
              <BoardItemMenu offset={4} item={newItem} resetErrorBoundary={resetErrorBoundary} />
-              <WidgetError kind={item.kind} error={error as unknown} resetErrorBoundary={resetErrorBoundary} />
+              <WidgetError kind={item.kind} error={error} resetErrorBoundary={resetErrorBoundary} />
            </>
          )}
        >
@@ -58,6 +58,7 @@ export const useCategoryActions = () => {
              ...section,
              yOffset: section.yOffset + 2,
            })),
+          ...previous.sections.filter((section) => section.kind !== "category" && section.kind !== "empty"),
        ] satisfies Section[],
      }));
    },
@@ -38,8 +38,8 @@
    "@homarr/validation": "workspace:^0.1.0",
    "@homarr/widgets": "workspace:^0.1.0",
    "dayjs": "^1.11.19",
-    "dotenv": "^17.2.3",
-    "fastify": "^5.6.2",
+    "dotenv": "^17.2.4",
+    "fastify": "^5.7.4",
    "superjson": "2.2.6",
    "undici": "7.18.2"
  },
@@ -47,11 +47,11 @@
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/node": "^24.10.7",
+    "@types/node": "^24.10.12",
    "dotenv-cli": "^11.0.0",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.3",
    "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "tsx": "4.20.4",
    "typescript": "^5.9.3"
  }
@@ -25,7 +25,7 @@
    "@homarr/definitions": "workspace:^0.1.0",
    "@homarr/redis": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "dotenv": "^17.2.3",
+    "dotenv": "^17.2.4",
    "tsx": "4.20.4",
    "ws": "^8.19.0"
  },
@@ -34,9 +34,9 @@
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
    "@types/ws": "^8.18.1",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.3",
    "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "typescript": "^5.9.3"
  }
 }
@@ -0,0 +1,6 @@
+FROM node:24.13.0-trixie AS base
+WORKDIR /app
+COPY package.json .
+COPY pnpm-lock.yaml .
+RUN corepack enable pnpm && pnpm install --frozen-lockfile
+CMD ["sleep", "60s"]
@@ -0,0 +1,17 @@
+{
+  "name": "homarr-prebuilt-debian",
+  "private": true,
+  "dependencies": {
+    "better-sqlite3": "^12.6.2"
+  },
+  "packageManager": "pnpm@10.29.1",
+  "engines": {
+    "node": ">=24.13.0",
+    "pnpm": ">=10.29.1"
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "better-sqlite3"
+    ]
+  }
+}
@@ -0,0 +1,286 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      better-sqlite3:
+        specifier: ^12.6.2
+        version: 12.6.2
+
+packages:
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  better-sqlite3@12.6.2:
+    resolution: {integrity: sha512-8VYKM3MjCa9WcaSAI3hzwhmyHVlH8tiGFwf0RlTsZPWJ1I5MkzjiudCo4KC4DxOaL/53A5B1sI/IbldNFDbsKA==}
+    engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
+
+  bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  chownr@1.1.4:
+    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+
+  decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+
+  deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
+  end-of-stream@1.4.5:
+    resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
+
+  expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+
+  file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
+  fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
+  node-abi@3.85.0:
+    resolution: {integrity: sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==}
+    engines: {node: '>=10'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  pump@3.0.3:
+    resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
+
+  rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+
+  tar-fs@2.1.4:
+    resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==}
+
+  tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
+
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+snapshots:
+
+  base64-js@1.5.1: {}
+
+  better-sqlite3@12.6.2:
+    dependencies:
+      bindings: 1.5.0
+      prebuild-install: 7.1.3
+
+  bindings@1.5.0:
+    dependencies:
+      file-uri-to-path: 1.0.0
+
+  bl@4.1.0:
+    dependencies:
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
+  chownr@1.1.4: {}
+
+  decompress-response@6.0.0:
+    dependencies:
+      mimic-response: 3.1.0
+
+  deep-extend@0.6.0: {}
+
+  detect-libc@2.1.2: {}
+
+  end-of-stream@1.4.5:
+    dependencies:
+      once: 1.4.0
+
+  expand-template@2.0.3: {}
+
+  file-uri-to-path@1.0.0: {}
+
+  fs-constants@1.0.0: {}
+
+  github-from-package@0.0.0: {}
+
+  ieee754@1.2.1: {}
+
+  inherits@2.0.4: {}
+
+  ini@1.3.8: {}
+
+  mimic-response@3.1.0: {}
+
+  minimist@1.2.8: {}
+
+  mkdirp-classic@0.5.3: {}
+
+  napi-build-utils@2.0.0: {}
+
+  node-abi@3.85.0:
+    dependencies:
+      semver: 7.7.3
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  prebuild-install@7.1.3:
+    dependencies:
+      detect-libc: 2.1.2
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 2.0.0
+      node-abi: 3.85.0
+      pump: 3.0.3
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.4
+      tunnel-agent: 0.6.0
+
+  pump@3.0.3:
+    dependencies:
+      end-of-stream: 1.4.5
+      once: 1.4.0
+
+  rc@1.2.8:
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
+
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+
+  safe-buffer@5.2.1: {}
+
+  semver@7.7.3: {}
+
+  simple-concat@1.0.1: {}
+
+  simple-get@4.0.1:
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  strip-json-comments@2.0.1: {}
+
+  tar-fs@2.1.4:
+    dependencies:
+      chownr: 1.1.4
+      mkdirp-classic: 0.5.3
+      pump: 3.0.3
+      tar-stream: 2.2.0
+
+  tar-stream@2.2.0:
+    dependencies:
+      bl: 4.1.0
+      end-of-stream: 1.4.5
+      fs-constants: 1.0.0
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  util-deprecate@1.0.2: {}
+
+  wrappy@1.0.2: {}
@@ -78,6 +78,13 @@
 </a>
 </td>
 <td align="center">
+<a href="https://homarr.dev/docs/integrations/coolify" target="_blank" rel="noreferrer noopener">
+  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/coolify.svg" alt="Coolify" width="90" height="90" />
+  <br/>  
+  <p align="center">Coolify</p>
+</a>
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/dash-dot" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/dashdot.png" alt="Dash." width="90" height="90" />
  <br/>  
@@ -97,15 +104,15 @@
  <br/>  
  <p align="center">Docker<br/>Hub</p>
 </a>
-</td>
-<td align="center">
+</td></tr>
+<tr><td align="center">
 <a href="https://homarr.dev/docs/integrations/emby" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/emby.svg" alt="Emby" width="90" height="90" />
  <br/>  
  <p align="center">Emby</p>
 </a>
-</td></tr>
-<tr><td align="center">
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/github" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/github.svg" alt="Github" width="90" height="90" />
  <br/>  
@@ -146,15 +153,15 @@
  <br/>  
  <p align="center">Jellyfin</p>
 </a>
-</td>
-<td align="center">
+</td></tr>
+<tr><td align="center">
 <a href="https://homarr.dev/docs/integrations/jellyseerr" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/jellyseerr.svg" alt="Jellyseerr" width="90" height="90" />
  <br/>  
  <p align="center">Jellyseerr</p>
 </a>
-</td></tr>
-<tr><td align="center">
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/lidarr" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/lidarr.svg" alt="Lidarr" width="90" height="90" />
  <br/>  
@@ -195,15 +202,15 @@
  <br/>  
  <p align="center">NZBGet</p>
 </a>
-</td>
-<td align="center">
+</td></tr>
+<tr><td align="center">
 <a href="https://homarr.dev/docs/integrations/open-media-vault" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/openmediavault.svg" alt="OpenMediaVault" width="90" height="90" />
  <br/>  
  <p align="center">OpenMediaVault</p>
 </a>
-</td></tr>
-<tr><td align="center">
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/opnsense" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/opnsense.svg" alt="OPNsense" width="90" height="90" />
  <br/>  
@@ -244,15 +251,15 @@
  <br/>  
  <p align="center">Proxmox</p>
 </a>
-</td>
-<td align="center">
+</td></tr>
+<tr><td align="center">
 <a href="https://homarr.dev/docs/integrations/q-bittorent" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg" alt="qBittorrent" width="90" height="90" />
  <br/>  
  <p align="center">qBittorrent</p>
 </a>
-</td></tr>
-<tr><td align="center">
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/quay" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/quay.png" alt="Quay" width="90" height="90" />
  <br/>  
@@ -293,15 +300,15 @@
  <br/>  
  <p align="center">Tdarr</p>
 </a>
-</td>
-<td align="center">
+</td></tr>
+<tr><td align="center">
 <a href="https://homarr.dev/docs/integrations/transmission" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/transmission.svg" alt="Transmission" width="90" height="90" />
  <br/>  
  <p align="center">Transmission</p>
 </a>
-</td></tr>
-<tr><td align="center">
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/truenas" target="_blank" rel="noreferrer noopener">
  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/truenas.svg" alt="TrueNAS" width="90" height="90" />
  <br/>  
@@ -1,9 +1,9 @@
 import { mkdir } from "fs/promises";
 import path from "path";
-import { createClient } from "@libsql/client/node";
 import { createId } from "@paralleldrive/cuid2";
-import { drizzle, LibSQLDatabase } from "drizzle-orm/libsql";
-import { migrate } from "drizzle-orm/libsql/migrator";
+import Database from "better-sqlite3";
+import { BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3";
+import { migrate } from "drizzle-orm/better-sqlite3/migrator";

 import { DB_CASING } from "../../packages/core/src/infrastructure/db/constants";
 import * as sqliteSchema from "../../packages/db/schema/sqlite";
@@ -14,10 +14,7 @@ export const createSqliteDbFileAsync = async () => {

  const localDbUrl = path.join(localMountPath, "db", "db.sqlite");

-  const connection = createClient({
-    url: `file:${localDbUrl}`,
-  });
-
+  const connection = new Database(localDbUrl);
  const db = drizzle(connection, {
    schema: sqliteSchema,
    casing: DB_CASING,
@@ -33,4 +30,4 @@ export const createSqliteDbFileAsync = async () => {
  };
 };

-export type SqliteDatabase = LibSQLDatabase<typeof sqliteSchema>;
+export type SqliteDatabase = BetterSQLite3Database<typeof sqliteSchema>;
@@ -1,6 +1,6 @@
 {
  "name": "homarr",
-  "version": "1.50.1",
+  "version": "1.53.1",
  "private": true,
  "scripts": {
    "build": "cross-env CI=true turbo build",
@@ -39,35 +39,36 @@
    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/commit-analyzer": "^13.0.1",
    "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^12.0.2",
-    "@semantic-release/npm": "^13.1.3",
+    "@semantic-release/github": "^12.0.5",
+    "@semantic-release/npm": "^13.1.4",
    "@semantic-release/release-notes-generator": "^14.1.0",
    "@testcontainers/redis": "^11.11.0",
-    "@turbo/gen": "^2.7.4",
-    "@vitejs/plugin-react": "^5.1.2",
-    "@vitest/coverage-v8": "^4.0.17",
-    "@vitest/ui": "^4.0.17",
+    "@turbo/gen": "^2.8.3",
+    "@vitejs/plugin-react": "^5.1.3",
+    "@vitest/coverage-v8": "^4.0.18",
+    "@vitest/ui": "^4.0.18",
    "conventional-changelog-conventionalcommits": "^9.1.0",
    "cross-env": "^10.1.0",
-    "jsdom": "^27.4.0",
+    "jsdom": "^28.0.0",
    "json5": "^2.2.3",
-    "prettier": "^3.7.4",
-    "semantic-release": "^25.0.2",
+    "prettier": "^3.8.1",
+    "semantic-release": "^25.0.3",
    "testcontainers": "^11.11.0",
-    "turbo": "^2.7.4",
+    "turbo": "^2.8.3",
    "typescript": "^5.9.3",
-    "vite-tsconfig-paths": "^6.0.4",
-    "vitest": "^4.0.17"
+    "vite-tsconfig-paths": "^6.1.0",
+    "vitest": "^4.0.18"
  },
-  "packageManager": "pnpm@10.28.0",
+  "packageManager": "pnpm@10.29.1",
  "engines": {
-    "node": ">=24.12.0",
-    "pnpm": ">=10.28.0"
+    "node": ">=24.13.0",
+    "pnpm": ">=10.29.1"
  },
  "pnpm": {
    "onlyBuiltDependencies": [
      "@tree-sitter-grammars/tree-sitter-yaml",
      "bcrypt",
+      "better-sqlite3",
      "cpu-features",
      "esbuild",
      "sharp",
@@ -78,18 +79,18 @@
    "overrides": {
      "@babel/helpers@<7.26.10": ">=7.28.6",
      "@babel/runtime@<7.26.10": ">=7.28.6",
-      "axios@>=1.0.0 <1.8.2": ">=1.13.2",
+      "axios@>=1.0.0 <1.8.2": ">=1.13.5",
      "brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
      "brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
-      "esbuild@<=0.24.2": ">=0.27.2",
+      "esbuild@<=0.24.2": ">=0.27.3",
      "form-data@>=4.0.0 <4.0.4": ">=4.0.5",
-      "hono@<4.6.5": ">=4.11.4",
+      "hono@<4.6.5": ">=4.11.9",
      "linkifyjs@<4.3.2": ">=4.3.2",
      "nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
      "prismjs@<1.30.0": ">=1.30.0",
-      "proxmox-api>undici": "7.18.2",
-      "react-is": "^19.2.3",
-      "rollup@>=4.0.0 <4.22.4": ">=4.55.1",
+      "proxmox-api>undici": "7.19.2",
+      "react-is": "^19.2.4",
+      "rollup@>=4.0.0 <4.22.4": ">=4.57.1",
      "sha.js@<=2.4.11": ">=2.4.12",
      "tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
      "tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
@@ -22,8 +22,11 @@
  },
  "prettier": "@homarr/prettier-config",
  "dependencies": {
+    "@homarr/auth": "workspace:^0.1.0",
+    "@homarr/common": "workspace:^0.1.0",
    "@homarr/core": "workspace:^0.1.0",
    "@homarr/db": "workspace:^0.1.0",
+    "@homarr/docker": "workspace:^0.1.0",
    "@homarr/server-settings": "workspace:^0.1.0",
    "@umami/node": "^0.4.0",
    "superjson": "2.2.6"
@@ -1,17 +1,52 @@
 import type { UmamiEventData } from "@umami/node";
 import { Umami } from "@umami/node";

+import { isProviderEnabled } from "@homarr/auth/server";
+import { Stopwatch } from "@homarr/common";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import { count, db } from "@homarr/db";
+import { isMysql, isPostgresql } from "@homarr/db/collection";
 import { getServerSettingByKeyAsync } from "@homarr/db/queries";
-import { integrations, items, users } from "@homarr/db/schema";
-import type { defaultServerSettings } from "@homarr/server-settings";
+import {
+  apiKeys,
+  apps,
+  boards,
+  cronJobConfigurations,
+  groups,
+  iconRepositories,
+  icons,
+  integrations,
+  invites,
+  itemLayouts,
+  items,
+  layouts,
+  medias,
+  searchEngines,
+  sectionLayouts,
+  sections,
+  users,
+} from "@homarr/db/schema";
+import { env as dockerEnv } from "@homarr/docker/env";

-import { Stopwatch } from "../../common/src";
+import packageJson from "../../../package.json";
 import { UMAMI_HOST_URL, UMAMI_WEBSITE_ID } from "./constants";

 const logger = createLogger({ module: "analytics" });

+const getDatabaseType = (): "mysql" | "postgresql" | "sqlite" => {
+  if (isMysql()) return "mysql";
+  if (isPostgresql()) return "postgresql";
+  return "sqlite";
+};
+
+const getEnabledAuthProviders = (): string[] => {
+  const providers: string[] = [];
+  if (isProviderEnabled("credentials")) providers.push("credentials");
+  if (isProviderEnabled("oidc")) providers.push("oidc");
+  if (isProviderEnabled("ldap")) providers.push("ldap");
+  return providers;
+};
+
 export const sendServerAnalyticsAsync = async () => {
  const stopWatch = new Stopwatch();
  const analyticsSettings = await getServerSettingByKeyAsync(db, "analytics");
@@ -27,67 +62,48 @@ export const sendServerAnalyticsAsync = async () => {
    websiteId: UMAMI_WEBSITE_ID,
  });

-  await sendIntegrationDataAsync(umamiInstance, analyticsSettings);
-  await sendWidgetDataAsync(umamiInstance, analyticsSettings);
-  await sendUserDataAsync(umamiInstance, analyticsSettings);
+  const enabledAuthProviders = getEnabledAuthProviders();

-  logger.info(`Sent all analytics in ${stopWatch.getElapsedInHumanWords()}`);
-};
+  const analyticsData: UmamiEventData = {
+    homarrVersion: packageJson.version,
+    databaseType: getDatabaseType(),
+    dockerEnabled: dockerEnv.ENABLE_DOCKER ? 1 : 0,
+    kubernetesEnabled: dockerEnv.ENABLE_KUBERNETES ? 1 : 0,
+    authCredentials: enabledAuthProviders.includes("credentials") ? 1 : 0,
+    authOidc: enabledAuthProviders.includes("oidc") ? 1 : 0,
+    authLdap: enabledAuthProviders.includes("ldap") ? 1 : 0,
+    countUsers: await db.$count(users),
+    countBoards: await db.$count(boards),
+    countGroups: await db.$count(groups),
+    countApps: await db.$count(apps),
+    countWidgets: await db.$count(items),
+    countSections: await db.$count(sections),
+    countIntegrations: await db.$count(integrations),
+    countSearchEngines: await db.$count(searchEngines),
+    countIconRepositories: await db.$count(iconRepositories),
+    countIcons: await db.$count(icons),
+    countApiKeys: await db.$count(apiKeys),
+    countInvites: await db.$count(invites),
+    countMedias: await db.$count(medias),
+    countLayouts: await db.$count(layouts),
+    countItemLayouts: await db.$count(itemLayouts),
+    countSectionLayouts: await db.$count(sectionLayouts),
+    countCronJobConfigs: await db.$count(cronJobConfigurations),
+  };

-const sendWidgetDataAsync = async (umamiInstance: Umami, analyticsSettings: typeof defaultServerSettings.analytics) => {
-  if (!analyticsSettings.enableWidgetData) {
-    return;
-  }
-  const widgetCount = await db.$count(items);
-
-  const response = await umamiInstance.track("server-widget-data", {
-    countWidgets: widgetCount,
-  });
-  if (response.ok) {
-    return;
-  }
-
-  logger.warn("Unable to send track event data to Umami instance");
-};
-
-const sendUserDataAsync = async (umamiInstance: Umami, analyticsSettings: typeof defaultServerSettings.analytics) => {
-  if (!analyticsSettings.enableUserData) {
-    return;
-  }
-  const userCount = await db.$count(users);
-
-  const response = await umamiInstance.track("server-user-data", {
-    countUsers: userCount,
-  });
-  if (response.ok) {
-    return;
-  }
-
-  logger.warn("Unable to send track event data to Umami instance");
-};
-
-const sendIntegrationDataAsync = async (
-  umamiInstance: Umami,
-  analyticsSettings: typeof defaultServerSettings.analytics,
-) => {
-  if (!analyticsSettings.enableIntegrationData) {
-    return;
-  }
  const integrationKinds = await db
    .select({ kind: integrations.kind, count: count(integrations.id) })
    .from(integrations)
    .groupBy(integrations.kind);

-  const map: UmamiEventData = {};
-
  integrationKinds.forEach((integrationKind) => {
-    map[integrationKind.kind] = integrationKind.count;
+    analyticsData[`integration_${integrationKind.kind}`] = integrationKind.count;
  });

-  const response = await umamiInstance.track("server-integration-data-kind", map);
-  if (response.ok) {
-    return;
+  const response = await umamiInstance.track("server-analytics-v2", analyticsData);
+  if (!response.ok) {
+    logger.warn("Unable to send analytics to Umami instance");
  }

-  logger.warn("Unable to send track event data to Umami instance");
+  logger.info(`Sent analytics in ${stopWatch.getElapsedInHumanWords()}`);
 };
@@ -41,15 +41,15 @@
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
    "@kubernetes/client-node": "^1.4.0",
-    "@tanstack/react-query": "^5.90.16",
-    "@trpc/client": "^11.8.1",
-    "@trpc/react-query": "^11.8.1",
-    "@trpc/server": "^11.8.1",
-    "@trpc/tanstack-react-query": "^11.8.1",
+    "@tanstack/react-query": "^5.90.20",
+    "@trpc/client": "^11.9.0",
+    "@trpc/react-query": "^11.9.0",
+    "@trpc/server": "^11.9.0",
+    "@trpc/tanstack-react-query": "^11.9.0",
    "lodash.clonedeep": "^4.5.0",
-    "next": "16.1.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "next": "16.1.6",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
    "superjson": "2.2.6",
    "trpc-to-openapi": "^3.1.0",
    "zod": "^4.2.1"
@@ -59,7 +59,7 @@
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
    "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "typescript": "^5.9.3"
  }
 }
@@ -1,54 +1,32 @@
-import { apiKeysRouter } from "./router/apiKeys";
-import { appRouter as innerAppRouter } from "./router/app";
-import { boardRouter } from "./router/board";
-import { certificateRouter } from "./router/certificates/certificate-router";
-import { cronJobsRouter } from "./router/cron-jobs";
-import { dockerRouter } from "./router/docker/docker-router";
-import { groupRouter } from "./router/group";
-import { homeRouter } from "./router/home";
-import { iconsRouter } from "./router/icons";
-import { importRouter } from "./router/import/import-router";
-import { infoRouter } from "./router/info";
-import { integrationRouter } from "./router/integration/integration-router";
-import { inviteRouter } from "./router/invite";
-import { kubernetesRouter } from "./router/kubernetes/router/kubernetes-router";
-import { locationRouter } from "./router/location";
-import { logRouter } from "./router/log";
-import { mediaRouter } from "./router/medias/media-router";
-import { onboardRouter } from "./router/onboard/onboard-router";
-import { searchEngineRouter } from "./router/search-engine/search-engine-router";
-import { sectionRouter } from "./router/section/section-router";
-import { serverSettingsRouter } from "./router/serverSettings";
-import { updateCheckerRouter } from "./router/update-checker";
-import { userRouter } from "./router/user";
-import { widgetRouter } from "./router/widgets";
+import { lazy } from "@trpc/server";
+
 import { createTRPCRouter } from "./trpc";

 export const appRouter = createTRPCRouter({
-  user: userRouter,
-  group: groupRouter,
-  invite: inviteRouter,
-  integration: integrationRouter,
-  board: boardRouter,
-  section: sectionRouter,
-  app: innerAppRouter,
-  searchEngine: searchEngineRouter,
-  widget: widgetRouter,
-  location: locationRouter,
-  log: logRouter,
-  icon: iconsRouter,
-  import: importRouter,
-  onboard: onboardRouter,
-  home: homeRouter,
-  docker: dockerRouter,
-  kubernetes: kubernetesRouter,
-  serverSettings: serverSettingsRouter,
-  cronJobs: cronJobsRouter,
-  apiKeys: apiKeysRouter,
-  media: mediaRouter,
-  updateChecker: updateCheckerRouter,
-  certificates: certificateRouter,
-  info: infoRouter,
+  user: lazy(() => import("./router/user").then((mod) => mod.userRouter)),
+  group: lazy(() => import("./router/group").then((mod) => mod.groupRouter)),
+  invite: lazy(() => import("./router/invite").then((mod) => mod.inviteRouter)),
+  integration: lazy(() => import("./router/integration/integration-router").then((mod) => mod.integrationRouter)),
+  board: lazy(() => import("./router/board").then((mod) => mod.boardRouter)),
+  section: lazy(() => import("./router/section/section-router").then((mod) => mod.sectionRouter)),
+  app: lazy(() => import("./router/app").then((mod) => mod.appRouter)),
+  searchEngine: lazy(() => import("./router/search-engine/search-engine-router").then((mod) => mod.searchEngineRouter)),
+  widget: lazy(() => import("./router/widgets").then((mod) => mod.widgetRouter)),
+  location: lazy(() => import("./router/location").then((mod) => mod.locationRouter)),
+  log: lazy(() => import("./router/log").then((mod) => mod.logRouter)),
+  icon: lazy(() => import("./router/icons").then((mod) => mod.iconsRouter)),
+  import: lazy(() => import("./router/import/import-router").then((mod) => mod.importRouter)),
+  onboard: lazy(() => import("./router/onboard/onboard-router").then((mod) => mod.onboardRouter)),
+  home: lazy(() => import("./router/home").then((mod) => mod.homeRouter)),
+  docker: lazy(() => import("./router/docker/docker-router").then((mod) => mod.dockerRouter)),
+  kubernetes: lazy(() => import("./router/kubernetes/router/kubernetes-router").then((mod) => mod.kubernetesRouter)),
+  serverSettings: lazy(() => import("./router/serverSettings").then((mod) => mod.serverSettingsRouter)),
+  cronJobs: lazy(() => import("./router/cron-jobs").then((mod) => mod.cronJobsRouter)),
+  apiKeys: lazy(() => import("./router/apiKeys").then((mod) => mod.apiKeysRouter)),
+  media: lazy(() => import("./router/medias/media-router").then((mod) => mod.mediaRouter)),
+  updateChecker: lazy(() => import("./router/update-checker").then((mod) => mod.updateCheckerRouter)),
+  certificates: lazy(() => import("./router/certificates/certificate-router").then((mod) => mod.certificateRouter)),
+  info: lazy(() => import("./router/info").then((mod) => mod.infoRouter)),
 });

 // export type definition of API
@@ -1,7 +1,9 @@
 import { TRPCError } from "@trpc/server";
 import { z } from "zod/v4";

+import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
+import type { Database, InferSelectModel } from "@homarr/db";
 import { asc, eq, inArray, like } from "@homarr/db";
 import { apps } from "@homarr/db/schema";
 import { selectAppSchema } from "@homarr/db/validationSchemas";
@@ -11,7 +13,7 @@ import { byIdSchema, paginatedSchema } from "@homarr/validation/common";

 import { convertIntersectionToZodObject } from "../schema-merger";
 import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../trpc";
-import { canUserSeeAppAsync } from "./app/app-access-control";
+import { AppAccessControl } from "./app/app-access-control";

 const defaultIcon = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/homarr.svg";

@@ -89,9 +91,8 @@ export const appRouter = createTRPCRouter({
    .output(selectAppSchema)
    .meta({ openapi: { method: "GET", path: "/api/apps/{id}", tags: ["apps"], protect: true } })
    .query(async ({ ctx, input }) => {
-      const app = await ctx.db.query.apps.findFirst({
-        where: eq(apps.id, input.id),
-      });
+      const repository = new AppRepository(ctx.db, ctx.session?.user ?? null);
+      const app = await repository.getByIdAsync(input.id);

      if (!app) {
        throw new TRPCError({
@@ -100,20 +101,11 @@ export const appRouter = createTRPCRouter({
        });
      }

-      const canUserSeeApp = await canUserSeeAppAsync(ctx.session?.user ?? null, app.id);
-      if (!canUserSeeApp) {
-        throw new TRPCError({
-          code: "NOT_FOUND",
-          message: "App not found",
-        });
-      }
-
      return app;
    }),
  byIds: publicProcedure.input(z.array(z.string())).query(async ({ ctx, input }) => {
-    return await ctx.db.query.apps.findMany({
-      where: inArray(apps.id, input),
-    });
+    const repository = new AppRepository(ctx.db, ctx.session?.user ?? null);
+    return await repository.getByIdsAsync(input);
  }),
  create: permissionRequiredProcedure
    .requiresPermission("app-create")
@@ -141,15 +133,13 @@ export const appRouter = createTRPCRouter({
    .output(z.void())
    .mutation(async ({ ctx, input }) => {
      await ctx.db.insert(apps).values(
-        await Promise.all(
-          input.map(async (app) => ({
-            id: createId(),
-            name: app.name,
-            description: app.description,
-            iconUrl: app.iconUrl ?? (await getIconForName(ctx.db, app.name))?.url ?? defaultIcon,
-            href: app.href,
-          })),
-        ),
+        input.map((app) => ({
+          id: createId(),
+          name: app.name,
+          description: app.description,
+          iconUrl: app.iconUrl ?? getIconForName(ctx.db, app.name).sync()?.url ?? defaultIcon,
+          href: app.href,
+        })),
      );
    }),
  update: permissionRequiredProcedure
@@ -189,3 +179,30 @@ export const appRouter = createTRPCRouter({
      await ctx.db.delete(apps).where(eq(apps.id, input.id));
    }),
 });
+
+type App = InferSelectModel<typeof apps>;
+
+export class AppRepository {
+  private readonly accessControl: AppAccessControl;
+
+  constructor(
+    private db: Database,
+    user: Session["user"] | null,
+  ) {
+    this.accessControl = new AppAccessControl(db, user);
+  }
+
+  public async getByIdAsync(id: string): Promise<App | null> {
+    const apps = await this.getByIdsAsync([id]);
+    return apps[0] ?? null;
+  }
+
+  public async getByIdsAsync(ids: string[]): Promise<App[]> {
+    const canUserSeeApps = await this.accessControl.canUserSeeAppsAsync(ids);
+    const dbApps = await this.db.query.apps.findMany({
+      where: inArray(apps.id, ids),
+    });
+
+    return canUserSeeApps ? dbApps : [];
+  }
+}
@@ -1,45 +1,52 @@
 import SuperJSON from "superjson";

 import type { Session } from "@homarr/auth";
-import { db, eq, or } from "@homarr/db";
+import type { Database } from "@homarr/db";
+import { eq, or } from "@homarr/db";
 import { items } from "@homarr/db/schema";

 import type { WidgetComponentProps } from "../../../../widgets/src";

-export const canUserSeeAppAsync = async (user: Session["user"] | null, appId: string) => {
-  return await canUserSeeAppsAsync(user, [appId]);
-};
+export class AppAccessControl {
+  constructor(
+    private db: Database,
+    private user: Session["user"] | null,
+  ) {}

-export const canUserSeeAppsAsync = async (user: Session["user"] | null, appIds: string[]) => {
-  if (user) return true;
+  async canUserSeeAppAsync(appId: string) {
+    return await this.canUserSeeAppsAsync([appId]);
+  }

-  const appIdsOnPublicBoards = await getAllAppIdsOnPublicBoardsAsync();
-  return appIds.every((appId) => appIdsOnPublicBoards.includes(appId));
-};
+  async canUserSeeAppsAsync(appIds: string[]) {
+    // Currently any user can see all apps if they are logged in
+    if (this.user) return true;

-const getAllAppIdsOnPublicBoardsAsync = async () => {
-  const itemsWithApps = await db.query.items.findMany({
-    where: or(eq(items.kind, "app"), eq(items.kind, "bookmarks")),
-    with: {
-      board: {
-        columns: {
-          isPublic: true,
+    const appIdsOnPublicBoards = await this.getAllAppIdsOnPublicBoardsAsync();
+    return appIds.every((appId) => appIdsOnPublicBoards.includes(appId));
+  }
+
+  private async getAllAppIdsOnPublicBoardsAsync() {
+    const itemsWithApps = await this.db.query.items.findMany({
+      where: or(eq(items.kind, "app"), eq(items.kind, "bookmarks")),
+      with: {
+        board: {
+          columns: {
+            isPublic: true,
+          },
        },
      },
-    },
-  });
+    });
+
+    return itemsWithApps
+      .filter((item) => item.board.isPublic)
+      .flatMap((item) => {
+        if (item.kind === "app") {
+          const parsedOptions = SuperJSON.parse<WidgetComponentProps<"app">["options"]>(item.options);
+          return [parsedOptions.appId];
+        }

-  return itemsWithApps
-    .filter((item) => item.board.isPublic)
-    .flatMap((item) => {
-      if (item.kind === "app") {
-        const parsedOptions = SuperJSON.parse<WidgetComponentProps<"app">["options"]>(item.options);
-        return [parsedOptions.appId];
-      } else if (item.kind === "bookmarks") {
        const parsedOptions = SuperJSON.parse<WidgetComponentProps<"bookmarks">["options"]>(item.options);
        return parsedOptions.items;
-      }
-
-      throw new Error("Failed to get app ids from board. Invalid item kind: 'test'");
-    });
-};
+      });
+  }
+}
@@ -6,8 +6,8 @@ import { constructBoardPermissions } from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
 import type { DeviceType } from "@homarr/common/server";
 import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
-import { and, asc, eq, inArray, isNull, like, not, or, sql } from "@homarr/db";
-import { createDbInsertCollection } from "@homarr/db/collection";
+import { and, asc, eq, handleTransactionsAsync, inArray, isNull, like, not, or, sql } from "@homarr/db";
+import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection";
 import { getServerSettingByKeyAsync } from "@homarr/db/queries";
 import {
  boardGroupPermissions,
@@ -273,7 +273,7 @@ export const boardRouter = createTRPCRouter({
        },
      });

-      const createBoardCollection = createDbInsertCollection(["boards", "sections", "layouts"]);
+      const createBoardCollection = createDbInsertCollectionWithoutTransaction(["boards", "sections", "layouts"]);

      createBoardCollection.boards.push({
        id: boardId,
@@ -439,41 +439,86 @@ export const boardRouter = createTRPCRouter({
          })),
      );

-      await ctx.db.transaction(async (transaction) => {
-        transaction.insert(boards).values({
-          ...boardProps,
-          id: newBoardId,
-          name: input.name,
-          creatorId: ctx.session.user.id,
-        });
+      await handleTransactionsAsync(ctx.db, {
+        async handleAsync(db, schema) {
+          await db.transaction(async (transaction) => {
+            transaction.insert(schema.boards).values({
+              ...boardProps,
+              id: newBoardId,
+              name: input.name,
+              creatorId: ctx.session.user.id,
+            });

-        if (layoutsToInsert.length > 0) {
-          await transaction.insert(layouts).values(layoutsToInsert);
-        }
+            if (layoutsToInsert.length > 0) {
+              await transaction.insert(schema.layouts).values(layoutsToInsert);
+            }

-        if (sectionsToInsert.length > 0) {
-          await transaction.insert(sections).values(sectionsToInsert);
-        }
+            if (sectionsToInsert.length > 0) {
+              await transaction.insert(schema.sections).values(sectionsToInsert);
+            }

-        if (sectionLayoutsToInsert.length > 0) {
-          await transaction.insert(sectionLayouts).values(sectionLayoutsToInsert);
-        }
+            if (sectionLayoutsToInsert.length > 0) {
+              await transaction.insert(schema.sectionLayouts).values(sectionLayoutsToInsert);
+            }

-        if (sectionCollapseStatesToInsert.length > 0) {
-          await transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert);
-        }
+            if (sectionCollapseStatesToInsert.length > 0) {
+              await transaction.insert(schema.sectionCollapseStates).values(sectionCollapseStatesToInsert);
+            }

-        if (itemsToInsert.length > 0) {
-          await transaction.insert(items).values(itemsToInsert);
-        }
+            if (itemsToInsert.length > 0) {
+              await transaction.insert(schema.items).values(itemsToInsert);
+            }

-        if (itemLayoutsToInsert.length > 0) {
-          await transaction.insert(itemLayouts).values(itemLayoutsToInsert);
-        }
+            if (itemLayoutsToInsert.length > 0) {
+              await transaction.insert(schema.itemLayouts).values(itemLayoutsToInsert);
+            }

-        if (itemIntegrationsToInsert.length > 0) {
-          await transaction.insert(integrationItems).values(itemIntegrationsToInsert);
-        }
+            if (itemIntegrationsToInsert.length > 0) {
+              await transaction.insert(schema.integrationItems).values(itemIntegrationsToInsert);
+            }
+          });
+        },
+        handleSync(db) {
+          db.transaction((transaction) => {
+            transaction
+              .insert(boards)
+              .values({
+                ...boardProps,
+                id: newBoardId,
+                name: input.name,
+                creatorId: ctx.session.user.id,
+              })
+              .run();
+
+            if (layoutsToInsert.length > 0) {
+              transaction.insert(layouts).values(layoutsToInsert).run();
+            }
+
+            if (sectionsToInsert.length > 0) {
+              transaction.insert(sections).values(sectionsToInsert).run();
+            }
+
+            if (sectionLayoutsToInsert.length > 0) {
+              transaction.insert(sectionLayouts).values(sectionLayoutsToInsert).run();
+            }
+
+            if (sectionCollapseStatesToInsert.length > 0) {
+              transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert).run();
+            }
+
+            if (itemsToInsert.length > 0) {
+              transaction.insert(items).values(itemsToInsert).run();
+            }
+
+            if (itemLayoutsToInsert.length > 0) {
+              transaction.insert(itemLayouts).values(itemLayoutsToInsert).run();
+            }
+
+            if (itemIntegrationsToInsert.length > 0) {
+              transaction.insert(integrationItems).values(itemIntegrationsToInsert).run();
+            }
+          });
+        },
      });
    }),
  renameBoard: protectedProcedure.input(boardRenameSchema).mutation(async ({ ctx, input }) => {
@@ -711,189 +756,415 @@ export const boardRouter = createTRPCRouter({

    const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id);

-    await ctx.db.transaction(async (transaction) => {
-      const addedSections = filterAddedItems(input.sections, dbBoard.sections);
+    await handleTransactionsAsync(ctx.db, {
+      async handleAsync(db, schema) {
+        await db.transaction(async (transaction) => {
+          const addedSections = filterAddedItems(input.sections, dbBoard.sections);

-      if (addedSections.length > 0) {
-        await transaction.insert(sections).values(
-          addedSections.map((section) => ({
-            id: section.id,
-            kind: section.kind,
-            yOffset: section.kind !== "dynamic" ? section.yOffset : null,
-            xOffset: section.kind === "dynamic" ? null : 0,
-            options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
-            name: "name" in section ? section.name : null,
-            boardId: dbBoard.id,
-          })),
-        );
+          if (addedSections.length > 0) {
+            await transaction.insert(schema.sections).values(
+              addedSections.map((section) => ({
+                id: section.id,
+                kind: section.kind,
+                yOffset: section.kind !== "dynamic" ? section.yOffset : null,
+                xOffset: section.kind === "dynamic" ? null : 0,
+                options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
+                name: "name" in section ? section.name : null,
+                boardId: dbBoard.id,
+              })),
+            );

-        if (addedSections.some((section) => section.kind === "dynamic")) {
-          await transaction.insert(sectionLayouts).values(
-            addedSections
-              .filter((section) => section.kind === "dynamic")
-              .flatMap((section) =>
-                section.layouts.map(
-                  (sectionLayout): InferInsertModel<typeof sectionLayouts> => ({
-                    layoutId: sectionLayout.layoutId,
-                    sectionId: section.id,
-                    parentSectionId: sectionLayout.parentSectionId,
-                    height: sectionLayout.height,
-                    width: sectionLayout.width,
-                    xOffset: sectionLayout.xOffset,
-                    yOffset: sectionLayout.yOffset,
+            if (addedSections.some((section) => section.kind === "dynamic")) {
+              await transaction.insert(schema.sectionLayouts).values(
+                addedSections
+                  .filter((section) => section.kind === "dynamic")
+                  .flatMap((section) =>
+                    section.layouts.map(
+                      (sectionLayout): InferInsertModel<typeof schema.sectionLayouts> => ({
+                        layoutId: sectionLayout.layoutId,
+                        sectionId: section.id,
+                        parentSectionId: sectionLayout.parentSectionId,
+                        height: sectionLayout.height,
+                        width: sectionLayout.width,
+                        xOffset: sectionLayout.xOffset,
+                        yOffset: sectionLayout.yOffset,
+                      }),
+                    ),
+                  ),
+              );
+            }
+          }
+
+          const addedItems = filterAddedItems(input.items, dbBoard.items);
+
+          if (addedItems.length > 0) {
+            await transaction.insert(schema.items).values(
+              addedItems.map((item) => ({
+                id: item.id,
+                kind: item.kind,
+                options: superjson.stringify(item.options),
+                advancedOptions: superjson.stringify(item.advancedOptions),
+                boardId: dbBoard.id,
+              })),
+            );
+            await transaction.insert(schema.itemLayouts).values(
+              addedItems.flatMap((item) =>
+                item.layouts.map(
+                  (layoutSection): InferInsertModel<typeof schema.itemLayouts> => ({
+                    layoutId: layoutSection.layoutId,
+                    sectionId: layoutSection.sectionId,
+                    itemId: item.id,
+                    height: layoutSection.height,
+                    width: layoutSection.width,
+                    xOffset: layoutSection.xOffset,
+                    yOffset: layoutSection.yOffset,
                  }),
                ),
              ),
+            );
+          }
+
+          const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
+            integrationIds.map((integrationId) => ({
+              integrationId,
+              itemId,
+            })),
          );
-        }
-      }
-
-      const addedItems = filterAddedItems(input.items, dbBoard.items);
-
-      if (addedItems.length > 0) {
-        await transaction.insert(items).values(
-          addedItems.map((item) => ({
-            id: item.id,
-            kind: item.kind,
-            options: superjson.stringify(item.options),
-            advancedOptions: superjson.stringify(item.advancedOptions),
-            boardId: dbBoard.id,
-          })),
-        );
-        await transaction.insert(itemLayouts).values(
-          addedItems.flatMap((item) =>
-            item.layouts.map(
-              (layoutSection): InferInsertModel<typeof itemLayouts> => ({
-                layoutId: layoutSection.layoutId,
-                sectionId: layoutSection.sectionId,
-                itemId: item.id,
-                height: layoutSection.height,
-                width: layoutSection.width,
-                xOffset: layoutSection.xOffset,
-                yOffset: layoutSection.yOffset,
-              }),
-            ),
-          ),
-        );
-      }
-
-      const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
-        integrationIds.map((integrationId) => ({
-          integrationId,
-          itemId,
-        })),
-      );
-      const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
-        integrationIds.map((integrationId) => ({
-          integrationId,
-          itemId,
-        })),
-      );
-      const addedIntegrationRelations = inputIntegrationRelations.filter(
-        (inputRelation) =>
-          !dbIntegrationRelations.some(
-            (dbRelation) =>
-              dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
-          ),
-      );
-
-      if (addedIntegrationRelations.length > 0) {
-        await transaction.insert(integrationItems).values(
-          addedIntegrationRelations.map((relation) => ({
-            itemId: relation.itemId,
-            integrationId: relation.integrationId,
-          })),
-        );
-      }
-
-      const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
-
-      for (const item of updatedItems) {
-        await transaction
-          .update(items)
-          .set({
-            kind: item.kind,
-            options: superjson.stringify(item.options),
-            advancedOptions: superjson.stringify(item.advancedOptions),
-          })
-          .where(eq(items.id, item.id));
-
-        for (const itemSectionLayout of item.layouts) {
-          await transaction
-            .update(itemLayouts)
-            .set({
-              height: itemSectionLayout.height,
-              width: itemSectionLayout.width,
-              xOffset: itemSectionLayout.xOffset,
-              yOffset: itemSectionLayout.yOffset,
-              sectionId: itemSectionLayout.sectionId,
-            })
-            .where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)));
-        }
-      }
-
-      const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
-
-      for (const section of updatedSections) {
-        const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
-        await transaction
-          .update(sections)
-          .set({
-            yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
-            xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
-            options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
-            name: prev?.kind === "category" && "name" in section ? section.name : null,
-          })
-          .where(eq(sections.id, section.id));
-
-        if (section.kind !== "dynamic") continue;
-
-        for (const sectionLayout of section.layouts) {
-          await transaction
-            .update(sectionLayouts)
-            .set({
-              height: sectionLayout.height,
-              width: sectionLayout.width,
-              xOffset: sectionLayout.xOffset,
-              yOffset: sectionLayout.yOffset,
-              parentSectionId: sectionLayout.parentSectionId,
-            })
-            .where(and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)));
-        }
-      }
-
-      const removedIntegrationRelations = dbIntegrationRelations.filter(
-        (dbRelation) =>
-          !inputIntegrationRelations.some(
+          const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
+            integrationIds.map((integrationId) => ({
+              integrationId,
+              itemId,
+            })),
+          );
+          const addedIntegrationRelations = inputIntegrationRelations.filter(
            (inputRelation) =>
-              dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
-          ),
-      );
-
-      for (const relation of removedIntegrationRelations) {
-        await transaction
-          .delete(integrationItems)
-          .where(
-            and(
-              eq(integrationItems.itemId, relation.itemId),
-              eq(integrationItems.integrationId, relation.integrationId),
-            ),
+              !dbIntegrationRelations.some(
+                (dbRelation) =>
+                  dbRelation.itemId === inputRelation.itemId &&
+                  dbRelation.integrationId === inputRelation.integrationId,
+              ),
          );
-      }

-      const removedItems = filterRemovedItems(input.items, dbBoard.items);
+          if (addedIntegrationRelations.length > 0) {
+            await transaction.insert(schema.integrationItems).values(
+              addedIntegrationRelations.map((relation) => ({
+                itemId: relation.itemId,
+                integrationId: relation.integrationId,
+              })),
+            );
+          }

-      const itemIds = removedItems.map((item) => item.id);
-      if (itemIds.length > 0) {
-        await transaction.delete(items).where(inArray(items.id, itemIds));
-      }
+          const updatedItems = filterUpdatedItems(input.items, dbBoard.items);

-      const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
-      const sectionIds = removedSections.map((section) => section.id);
+          for (const item of updatedItems) {
+            await transaction
+              .update(schema.items)
+              .set({
+                kind: item.kind,
+                options: superjson.stringify(item.options),
+                advancedOptions: superjson.stringify(item.advancedOptions),
+              })
+              .where(eq(schema.items.id, item.id));

-      if (sectionIds.length > 0) {
-        await transaction.delete(sections).where(inArray(sections.id, sectionIds));
-      }
+            for (const itemSectionLayout of item.layouts) {
+              await transaction
+                .update(schema.itemLayouts)
+                .set({
+                  height: itemSectionLayout.height,
+                  width: itemSectionLayout.width,
+                  xOffset: itemSectionLayout.xOffset,
+                  yOffset: itemSectionLayout.yOffset,
+                  sectionId: itemSectionLayout.sectionId,
+                })
+                .where(
+                  and(
+                    eq(schema.itemLayouts.itemId, item.id),
+                    eq(schema.itemLayouts.layoutId, itemSectionLayout.layoutId),
+                  ),
+                );
+            }
+          }
+
+          const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
+
+          for (const section of updatedSections) {
+            const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
+            await transaction
+              .update(schema.sections)
+              .set({
+                yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
+                xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
+                options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
+                name: prev?.kind === "category" && "name" in section ? section.name : null,
+              })
+              .where(eq(schema.sections.id, section.id));
+
+            if (section.kind !== "dynamic") continue;
+
+            for (const sectionLayout of section.layouts) {
+              await transaction
+                .update(schema.sectionLayouts)
+                .set({
+                  height: sectionLayout.height,
+                  width: sectionLayout.width,
+                  xOffset: sectionLayout.xOffset,
+                  yOffset: sectionLayout.yOffset,
+                  parentSectionId: sectionLayout.parentSectionId,
+                })
+                .where(
+                  and(
+                    eq(schema.sectionLayouts.sectionId, section.id),
+                    eq(schema.sectionLayouts.layoutId, sectionLayout.layoutId),
+                  ),
+                );
+            }
+          }
+
+          const removedIntegrationRelations = dbIntegrationRelations.filter(
+            (dbRelation) =>
+              !inputIntegrationRelations.some(
+                (inputRelation) =>
+                  dbRelation.itemId === inputRelation.itemId &&
+                  dbRelation.integrationId === inputRelation.integrationId,
+              ),
+          );
+
+          for (const relation of removedIntegrationRelations) {
+            await transaction
+              .delete(schema.integrationItems)
+              .where(
+                and(
+                  eq(integrationItems.itemId, relation.itemId),
+                  eq(integrationItems.integrationId, relation.integrationId),
+                ),
+              );
+          }
+
+          const removedItems = filterRemovedItems(input.items, dbBoard.items);
+
+          const itemIds = removedItems.map((item) => item.id);
+          if (itemIds.length > 0) {
+            await transaction.delete(schema.items).where(inArray(schema.items.id, itemIds));
+          }
+
+          const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
+          const sectionIds = removedSections.map((section) => section.id);
+
+          if (sectionIds.length > 0) {
+            await transaction.delete(schema.sections).where(inArray(schema.sections.id, sectionIds));
+          }
+        });
+      },
+      handleSync(db) {
+        db.transaction((transaction) => {
+          const addedSections = filterAddedItems(input.sections, dbBoard.sections);
+
+          if (addedSections.length > 0) {
+            transaction
+              .insert(sections)
+              .values(
+                addedSections.map((section) => ({
+                  id: section.id,
+                  kind: section.kind,
+                  yOffset: section.kind !== "dynamic" ? section.yOffset : null,
+                  xOffset: section.kind === "dynamic" ? null : 0,
+                  options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
+                  name: "name" in section ? section.name : null,
+                  boardId: dbBoard.id,
+                })),
+              )
+              .run();
+
+            if (addedSections.some((section) => section.kind === "dynamic")) {
+              transaction
+                .insert(sectionLayouts)
+                .values(
+                  addedSections
+                    .filter((section) => section.kind === "dynamic")
+                    .flatMap((section) =>
+                      section.layouts.map(
+                        (sectionLayout): InferInsertModel<typeof sectionLayouts> => ({
+                          layoutId: sectionLayout.layoutId,
+                          sectionId: section.id,
+                          parentSectionId: sectionLayout.parentSectionId,
+                          height: sectionLayout.height,
+                          width: sectionLayout.width,
+                          xOffset: sectionLayout.xOffset,
+                          yOffset: sectionLayout.yOffset,
+                        }),
+                      ),
+                    ),
+                )
+                .run();
+            }
+          }
+
+          const addedItems = filterAddedItems(input.items, dbBoard.items);
+
+          if (addedItems.length > 0) {
+            transaction
+              .insert(items)
+              .values(
+                addedItems.map((item) => ({
+                  id: item.id,
+                  kind: item.kind,
+                  options: superjson.stringify(item.options),
+                  advancedOptions: superjson.stringify(item.advancedOptions),
+                  boardId: dbBoard.id,
+                })),
+              )
+              .run();
+            transaction
+              .insert(itemLayouts)
+              .values(
+                addedItems.flatMap((item) =>
+                  item.layouts.map(
+                    (layoutSection): InferInsertModel<typeof itemLayouts> => ({
+                      layoutId: layoutSection.layoutId,
+                      sectionId: layoutSection.sectionId,
+                      itemId: item.id,
+                      height: layoutSection.height,
+                      width: layoutSection.width,
+                      xOffset: layoutSection.xOffset,
+                      yOffset: layoutSection.yOffset,
+                    }),
+                  ),
+                ),
+              )
+              .run();
+          }
+
+          const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
+            integrationIds.map((integrationId) => ({
+              integrationId,
+              itemId,
+            })),
+          );
+          const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
+            integrationIds.map((integrationId) => ({
+              integrationId,
+              itemId,
+            })),
+          );
+          const addedIntegrationRelations = inputIntegrationRelations.filter(
+            (inputRelation) =>
+              !dbIntegrationRelations.some(
+                (dbRelation) =>
+                  dbRelation.itemId === inputRelation.itemId &&
+                  dbRelation.integrationId === inputRelation.integrationId,
+              ),
+          );
+
+          if (addedIntegrationRelations.length > 0) {
+            transaction
+              .insert(integrationItems)
+              .values(
+                addedIntegrationRelations.map((relation) => ({
+                  itemId: relation.itemId,
+                  integrationId: relation.integrationId,
+                })),
+              )
+              .run();
+          }
+
+          const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
+
+          for (const item of updatedItems) {
+            transaction
+              .update(items)
+              .set({
+                kind: item.kind,
+                options: superjson.stringify(item.options),
+                advancedOptions: superjson.stringify(item.advancedOptions),
+              })
+              .where(eq(items.id, item.id))
+              .run();
+
+            for (const itemSectionLayout of item.layouts) {
+              transaction
+                .update(itemLayouts)
+                .set({
+                  height: itemSectionLayout.height,
+                  width: itemSectionLayout.width,
+                  xOffset: itemSectionLayout.xOffset,
+                  yOffset: itemSectionLayout.yOffset,
+                  sectionId: itemSectionLayout.sectionId,
+                })
+                .where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)))
+                .run();
+            }
+          }
+
+          const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
+
+          for (const section of updatedSections) {
+            const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
+            transaction
+              .update(sections)
+              .set({
+                yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
+                xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
+                options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
+                name: prev?.kind === "category" && "name" in section ? section.name : null,
+              })
+              .where(eq(sections.id, section.id))
+              .run();
+
+            if (section.kind !== "dynamic") continue;
+
+            for (const sectionLayout of section.layouts) {
+              transaction
+                .update(sectionLayouts)
+                .set({
+                  height: sectionLayout.height,
+                  width: sectionLayout.width,
+                  xOffset: sectionLayout.xOffset,
+                  yOffset: sectionLayout.yOffset,
+                  parentSectionId: sectionLayout.parentSectionId,
+                })
+                .where(
+                  and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)),
+                )
+                .run();
+            }
+          }
+
+          const removedIntegrationRelations = dbIntegrationRelations.filter(
+            (dbRelation) =>
+              !inputIntegrationRelations.some(
+                (inputRelation) =>
+                  dbRelation.itemId === inputRelation.itemId &&
+                  dbRelation.integrationId === inputRelation.integrationId,
+              ),
+          );
+
+          for (const relation of removedIntegrationRelations) {
+            transaction
+              .delete(integrationItems)
+              .where(
+                and(
+                  eq(integrationItems.itemId, relation.itemId),
+                  eq(integrationItems.integrationId, relation.integrationId),
+                ),
+              )
+              .run();
+          }
+
+          const removedItems = filterRemovedItems(input.items, dbBoard.items);
+
+          const itemIds = removedItems.map((item) => item.id);
+          if (itemIds.length > 0) {
+            transaction.delete(items).where(inArray(items.id, itemIds)).run();
+          }
+
+          const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
+          const sectionIds = removedSections.map((section) => section.id);
+
+          if (sectionIds.length > 0) {
+            transaction.delete(sections).where(inArray(sections.id, sectionIds)).run();
+          }
+        });
+      },
    });
  }),
  getBoardPermissions: protectedProcedure.input(byIdSchema).query(async ({ input, ctx }) => {
@@ -971,35 +1242,81 @@ export const boardRouter = createTRPCRouter({
  saveUserBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
    await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");

-    await ctx.db.transaction(async (transaction) => {
-      await transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
-      if (input.permissions.length === 0) {
-        return;
-      }
-      await transaction.insert(boardUserPermissions).values(
-        input.permissions.map((permission) => ({
-          userId: permission.principalId,
-          permission: permission.permission,
-          boardId: input.entityId,
-        })),
-      );
+    await handleTransactionsAsync(ctx.db, {
+      async handleAsync(db, schema) {
+        await db.transaction(async (transaction) => {
+          await transaction.delete(schema.boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
+          if (input.permissions.length === 0) {
+            return;
+          }
+          await transaction.insert(schema.boardUserPermissions).values(
+            input.permissions.map((permission) => ({
+              userId: permission.principalId,
+              permission: permission.permission,
+              boardId: input.entityId,
+            })),
+          );
+        });
+      },
+      handleSync(db) {
+        db.transaction((transaction) => {
+          transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)).run();
+          if (input.permissions.length === 0) {
+            return;
+          }
+          transaction
+            .insert(boardUserPermissions)
+            .values(
+              input.permissions.map((permission) => ({
+                userId: permission.principalId,
+                permission: permission.permission,
+                boardId: input.entityId,
+              })),
+            )
+            .run();
+        });
+      },
    });
  }),
  saveGroupBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
    await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");

-    await ctx.db.transaction(async (transaction) => {
-      await transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId));
-      if (input.permissions.length === 0) {
-        return;
-      }
-      await transaction.insert(boardGroupPermissions).values(
-        input.permissions.map((permission) => ({
-          groupId: permission.principalId,
-          permission: permission.permission,
-          boardId: input.entityId,
-        })),
-      );
+    await handleTransactionsAsync(ctx.db, {
+      async handleAsync(db, schema) {
+        await db.transaction(async (transaction) => {
+          await transaction
+            .delete(schema.boardGroupPermissions)
+            .where(eq(boardGroupPermissions.boardId, input.entityId));
+          if (input.permissions.length === 0) {
+            return;
+          }
+          await transaction.insert(schema.boardGroupPermissions).values(
+            input.permissions.map((permission) => ({
+              groupId: permission.principalId,
+              permission: permission.permission,
+              boardId: input.entityId,
+            })),
+          );
+        });
+      },
+      handleSync(db) {
+        db.transaction((transaction) => {
+          transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId)).run();
+          if (input.permissions.length === 0) {
+            return;
+          }
+          transaction
+            .insert(boardGroupPermissions)
+            .values(
+              input.permissions.map((permission) => ({
+                groupId: permission.principalId,
+                permission: permission.permission,
+                boardId: input.entityId,
+              })),
+            )
+            .run();
+        });
+      },
    });
  }),
  importOldmarrConfig: permissionRequiredProcedure
@@ -91,7 +91,7 @@ export const certificateRouter = createTRPCRouter({
        hostname: input.hostname,
        thumbprint: input.thumbprint,
      });
-      await ctx.db
+      const dbResult = await ctx.db
        .delete(trustedCertificateHostnames)
        .where(
          and(
@@ -103,6 +103,7 @@ export const certificateRouter = createTRPCRouter({
      logger.info("Removed trusted hostname", {
        hostname: input.hostname,
        thumbprint: input.thumbprint,
+        count: dbResult.changes,
      });
    }),
  removeCertificate: permissionRequiredProcedure
@@ -3,7 +3,7 @@ import { z } from "zod/v4";

 import { createId } from "@homarr/common";
 import type { Database } from "@homarr/db";
-import { and, eq, like, not } from "@homarr/db";
+import { and, eq, handleTransactionsAsync, like, not } from "@homarr/db";
 import { getMaxGroupPositionAsync } from "@homarr/db/queries";
 import { groupMembers, groupPermissions, groups } from "@homarr/db/schema";
 import { everyoneGroup } from "@homarr/definitions";
@@ -252,10 +252,21 @@ export const groupRouter = createTRPCRouter({
    .mutation(async ({ input, ctx }) => {
      const positions = input.positions.map((id, index) => ({ id, position: index + 1 }));

-      await ctx.db.transaction(async (trx) => {
-        for (const { id, position } of positions) {
-          await trx.update(groups).set({ position }).where(eq(groups.id, id));
-        }
+      await handleTransactionsAsync(ctx.db, {
+        handleAsync: async (db, schema) => {
+          await db.transaction(async (trx) => {
+            for (const { id, position } of positions) {
+              await trx.update(schema.groups).set({ position }).where(eq(groups.id, id));
+            }
+          });
+        },
+        handleSync: (db) => {
+          db.transaction((trx) => {
+            for (const { id, position } of positions) {
+              trx.update(groups).set({ position }).where(eq(groups.id, id)).run();
+            }
+          });
+        },
      });
    }),
  savePermissions: permissionRequiredProcedure
@@ -5,7 +5,7 @@ import { createId, objectEntries } from "@homarr/common";
 import { decryptSecret, encryptSecret } from "@homarr/common/server";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import type { Database } from "@homarr/db";
-import { and, asc, eq, inArray, like, or } from "@homarr/db";
+import { and, asc, eq, handleTransactionsAsync, inArray, like, or } from "@homarr/db";
 import {
  apps,
  groupMembers,
@@ -524,20 +524,45 @@ export const integrationRouter = createTRPCRouter({
    .mutation(async ({ input, ctx }) => {
      await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");

-      await ctx.db.transaction(async (transaction) => {
-        await transaction
-          .delete(integrationUserPermissions)
-          .where(eq(integrationUserPermissions.integrationId, input.entityId));
-        if (input.permissions.length === 0) {
-          return;
-        }
-        await transaction.insert(integrationUserPermissions).values(
-          input.permissions.map((permission) => ({
-            userId: permission.principalId,
-            permission: permission.permission,
-            integrationId: input.entityId,
-          })),
-        );
+      await handleTransactionsAsync(ctx.db, {
+        async handleAsync(db, schema) {
+          await ctx.db.transaction(async (transaction) => {
+            await transaction
+              .delete(schema.integrationUserPermissions)
+              .where(eq(schema.integrationUserPermissions.integrationId, input.entityId));
+            if (input.permissions.length === 0) {
+              return;
+            }
+            await transaction.insert(schema.integrationUserPermissions).values(
+              input.permissions.map((permission) => ({
+                userId: permission.principalId,
+                permission: permission.permission,
+                integrationId: input.entityId,
+              })),
+            );
+          });
+        },
+        handleSync(db) {
+          db.transaction((transaction) => {
+            transaction
+              .delete(integrationUserPermissions)
+              .where(eq(integrationUserPermissions.integrationId, input.entityId))
+              .run();
+            if (input.permissions.length === 0) {
+              return;
+            }
+            transaction
+              .insert(integrationUserPermissions)
+              .values(
+                input.permissions.map((permission) => ({
+                  userId: permission.principalId,
+                  permission: permission.permission,
+                  integrationId: input.entityId,
+                })),
+              )
+              .run();
+          });
+        },
      });
    }),
  saveGroupIntegrationPermissions: protectedProcedure
@@ -545,20 +570,45 @@ export const integrationRouter = createTRPCRouter({
    .mutation(async ({ input, ctx }) => {
      await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");

-      await ctx.db.transaction(async (transaction) => {
-        await transaction
-          .delete(integrationGroupPermissions)
-          .where(eq(integrationGroupPermissions.integrationId, input.entityId));
-        if (input.permissions.length === 0) {
-          return;
-        }
-        await transaction.insert(integrationGroupPermissions).values(
-          input.permissions.map((permission) => ({
-            groupId: permission.principalId,
-            permission: permission.permission,
-            integrationId: input.entityId,
-          })),
-        );
+      await handleTransactionsAsync(ctx.db, {
+        async handleAsync(db, schema) {
+          await db.transaction(async (transaction) => {
+            await transaction
+              .delete(schema.integrationGroupPermissions)
+              .where(eq(schema.integrationGroupPermissions.integrationId, input.entityId));
+            if (input.permissions.length === 0) {
+              return;
+            }
+            await transaction.insert(schema.integrationGroupPermissions).values(
+              input.permissions.map((permission) => ({
+                groupId: permission.principalId,
+                permission: permission.permission,
+                integrationId: input.entityId,
+              })),
+            );
+          });
+        },
+        handleSync(db) {
+          db.transaction((transaction) => {
+            transaction
+              .delete(integrationGroupPermissions)
+              .where(eq(integrationGroupPermissions.integrationId, input.entityId))
+              .run();
+            if (input.permissions.length === 0) {
+              return;
+            }
+            transaction
+              .insert(integrationGroupPermissions)
+              .values(
+                input.permissions.map((permission) => ({
+                  groupId: permission.principalId,
+                  permission: permission.permission,
+                  integrationId: input.entityId,
+                })),
+              )
+              .run();
+          });
+        },
      });
    }),
  searchInIntegration: protectedProcedure
@@ -1,22 +1,15 @@
+import { lazy } from "@trpc/server";
+
 import { createTRPCRouter } from "../../../trpc";
-import { clusterRouter } from "./cluster";
-import { configMapsRouter } from "./configMaps";
-import { ingressesRouter } from "./ingresses";
-import { namespacesRouter } from "./namespaces";
-import { nodesRouter } from "./nodes";
-import { podsRouter } from "./pods";
-import { secretsRouter } from "./secrets";
-import { servicesRouter } from "./services";
-import { volumesRouter } from "./volumes";

 export const kubernetesRouter = createTRPCRouter({
-  nodes: nodesRouter,
-  cluster: clusterRouter,
-  namespaces: namespacesRouter,
-  ingresses: ingressesRouter,
-  services: servicesRouter,
-  pods: podsRouter,
-  secrets: secretsRouter,
-  configMaps: configMapsRouter,
-  volumes: volumesRouter,
+  nodes: lazy(() => import("./nodes").then((mod) => mod.nodesRouter)),
+  cluster: lazy(() => import("./cluster").then((mod) => mod.clusterRouter)),
+  namespaces: lazy(() => import("./namespaces").then((mod) => mod.namespacesRouter)),
+  ingresses: lazy(() => import("./ingresses").then((mod) => mod.ingressesRouter)),
+  services: lazy(() => import("./services").then((mod) => mod.servicesRouter)),
+  pods: lazy(() => import("./pods").then((mod) => mod.podsRouter)),
+  secrets: lazy(() => import("./secrets").then((mod) => mod.secretsRouter)),
+  configMaps: lazy(() => import("./configMaps").then((mod) => mod.configMapsRouter)),
+  volumes: lazy(() => import("./volumes").then((mod) => mod.volumesRouter)),
 });
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { apps } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey } from "@homarr/definitions";

 import { appRouter } from "../app";
@@ -13,6 +13,14 @@ import * as appAccessControl from "../app/app-access-control";
 // Mock the auth module to return an empty session
 vi.mock("@homarr/auth", () => ({ auth: () => ({}) as Session }));

+const createFakeAccessControl = (canAccess: boolean) =>
+  vi.fn(
+    class {
+      canUserSeeAppAsync = async (_: string) => await Promise.resolve(canAccess);
+      canUserSeeAppsAsync = async (_: string[]) => await Promise.resolve(canAccess);
+    } as unknown as typeof appAccessControl.AppAccessControl,
+  );
+
 const createDefaultSession = (permissions: GroupPermissionKey[] = []): Session => ({
  user: { id: createId(), permissions, colorScheme: "light" },
  expires: new Date().toISOString(),
@@ -21,7 +29,7 @@ const createDefaultSession = (permissions: GroupPermissionKey[] = []): Session =
 describe("all should return all apps", () => {
  test("should return all apps with session", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -55,7 +63,7 @@ describe("all should return all apps", () => {
  test("should throw UNAUTHORIZED if the user is not authenticated", async () => {
    // Arrange
    const caller = appRouter.createCaller({
-      db: await createDbAsync(),
+      db: createDb(),
      deviceType: undefined,
      session: null,
    });
@@ -71,13 +79,13 @@ describe("all should return all apps", () => {
 describe("byId should return an app by id", () => {
  test("should return an app by id when canUserSeeAppAsync returns true", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
      session: null,
    });
-    vi.spyOn(appAccessControl, "canUserSeeAppAsync").mockReturnValue(Promise.resolve(true));
+    vi.spyOn(appAccessControl, "AppAccessControl").mockImplementation(createFakeAccessControl(true));

    await db.insert(apps).values([
      {
@@ -103,7 +111,7 @@ describe("byId should return an app by id", () => {

  test("should throw NOT_FOUND error when canUserSeeAppAsync returns false", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -118,7 +126,7 @@ describe("byId should return an app by id", () => {
        href: "https://mantine.dev",
      },
    ]);
-    vi.spyOn(appAccessControl, "canUserSeeAppAsync").mockReturnValue(Promise.resolve(false));
+    vi.spyOn(appAccessControl, "AppAccessControl").mockImplementation(createFakeAccessControl(false));

    // Act
    const actAsync = async () => await caller.byId({ id: "2" });
@@ -129,7 +137,7 @@ describe("byId should return an app by id", () => {

  test("should throw an error if the app does not exist", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -147,7 +155,7 @@ describe("byId should return an app by id", () => {
 describe("create should create a new app with all arguments", () => {
  test("should create a new app", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -176,7 +184,7 @@ describe("create should create a new app with all arguments", () => {

  test("should create a new app only with required arguments", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -207,7 +215,7 @@ describe("create should create a new app with all arguments", () => {
 describe("update should update an app", () => {
  test("should update an app", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -247,7 +255,7 @@ describe("update should update an app", () => {

  test("should throw an error if the app does not exist", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -273,7 +281,7 @@ describe("update should update an app", () => {
 describe("delete should delete an app", () => {
  test("should delete an app", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
@@ -22,7 +22,7 @@ import {
  serverSettings,
  users,
 } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions";

 import type { RouterOutputs } from "../..";
@@ -55,7 +55,7 @@ const createRandomUserAsync = async (db: Database) => {
 describe("getAllBoards should return all boards accessable to the current user", () => {
  test("without session it should return only public boards", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null });

    const user1 = await createRandomUserAsync(db);
@@ -86,7 +86,7 @@ describe("getAllBoards should return all boards accessable to the current user",

  test("with session containing board-view-all permission it should return all boards", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({
      db,
      deviceType: undefined,
@@ -128,7 +128,7 @@ describe("getAllBoards should return all boards accessable to the current user",

  test("with session user beeing creator it should return all private boards of them", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const user1 = await createRandomUserAsync(db);
@@ -170,7 +170,7 @@ describe("getAllBoards should return all boards accessable to the current user",
    "with %s group board permission it should show board",
    async (permission) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({
        db,
        deviceType: undefined,
@@ -236,7 +236,7 @@ describe("getAllBoards should return all boards accessable to the current user",
    "with %s user board permission it should show board",
    async (permission) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({
        db,
        deviceType: undefined,
@@ -290,7 +290,7 @@ describe("getAllBoards should return all boards accessable to the current user",
 describe("createBoard should create a new board", () => {
  test("should create a new board with permission board-create", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = {
      ...defaultSession,
      user: {
@@ -333,7 +333,7 @@ describe("createBoard should create a new board", () => {

  test("should throw error when user has no board-create permission", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -347,7 +347,7 @@ describe("createBoard should create a new board", () => {
 describe("rename board should rename board", () => {
  test("should rename board", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -375,7 +375,7 @@ describe("rename board should rename board", () => {

  test("should throw error when similar board name exists", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    await db.insert(users).values({
@@ -402,7 +402,7 @@ describe("rename board should rename board", () => {

  test("should throw error when board not found", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -418,7 +418,7 @@ describe("changeBoardVisibility should change board visibility", () => {
    "should change board visibility to %s",
    async (visibility) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
      const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -453,7 +453,7 @@ describe("changeBoardVisibility should change board visibility", () => {
 describe("deleteBoard should delete board", () => {
  test("should delete board", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -480,7 +480,7 @@ describe("deleteBoard should delete board", () => {

  test("should throw error when board not found", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -495,7 +495,7 @@ describe("getHomeBoard should return home board", () => {
  test("should return user home board when user has one", async () => {
    // Arrange
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -519,7 +519,7 @@ describe("getHomeBoard should return home board", () => {
  test("should return global home board when user doesn't have one", async () => {
    // Arrange
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -540,7 +540,7 @@ describe("getHomeBoard should return home board", () => {
  });
  test("should throw error when home board not configured in serverSettings", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    await createFullBoardAsync(db, "home");

@@ -556,7 +556,7 @@ describe("getBoardByName should return board by name", () => {
  it.each([["default"], ["something"]])("should return board by name %s when present", async (name) => {
    // Arrange
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const fullBoardProps = await createFullBoardAsync(db, name);
@@ -574,7 +574,7 @@ describe("getBoardByName should return board by name", () => {

  it("should throw error when not present", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    await createFullBoardAsync(db, "default");

@@ -590,7 +590,7 @@ describe("savePartialBoardSettings should save general settings", () => {
  it("should save general settings", async () => {
    // Arrange
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const newPageTitle = "newPageTitle";
@@ -647,7 +647,7 @@ describe("savePartialBoardSettings should save general settings", () => {
  });

  it("should throw error when board not found", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const actAsync = async () =>
@@ -666,7 +666,7 @@ describe("savePartialBoardSettings should save general settings", () => {
 describe("saveBoard should save full board", () => {
  it("should remove section when not present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -703,7 +703,7 @@ describe("saveBoard should save full board", () => {
  });
  it("should remove item when not present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -760,7 +760,7 @@ describe("saveBoard should save full board", () => {
  });
  it("should remove integration reference when not present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const anotherIntegration = {
      id: createId(),
@@ -832,7 +832,7 @@ describe("saveBoard should save full board", () => {
    "should add section when present in input",
    async (partialSection) => {
      const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

      const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -884,7 +884,7 @@ describe("saveBoard should save full board", () => {
  );
  it("should add item when present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -956,7 +956,7 @@ describe("saveBoard should save full board", () => {
  });
  it("should add integration reference when present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const integration = {
      id: createId(),
@@ -1024,7 +1024,7 @@ describe("saveBoard should save full board", () => {
    expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
  });
  it("should update section when present in input", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -1083,7 +1083,7 @@ describe("saveBoard should save full board", () => {
  });
  it("should update item when present in input", async () => {
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1147,7 +1147,7 @@ describe("saveBoard should save full board", () => {
    expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
  });
  it("should fail when board not found", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const actAsync = async () =>
@@ -1164,7 +1164,7 @@ describe("saveBoard should save full board", () => {
 describe("getBoardPermissions should return board permissions", () => {
  test("should return board permissions", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
    const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -1239,7 +1239,7 @@ describe("saveUserBoardPermissions should save user board permissions", () => {
    "should save user board permissions",
    async (permission) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
      const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -1281,7 +1281,7 @@ describe("saveGroupBoardPermissions should save group board permissions", () =>
    "should save group board permissions",
    async (permission) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
      const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");

@@ -1339,7 +1339,7 @@ const createNewLayout = (columnCount: number) => ({
 describe("saveLayouts should save layout changes", () => {
  test("should add layout when not present in database", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1363,7 +1363,7 @@ describe("saveLayouts should save layout changes", () => {
  });
  test("should add items and dynamic sections generated from grid-algorithm when new layout is added", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1394,7 +1394,7 @@ describe("saveLayouts should save layout changes", () => {
  });
  test("should update layout when present in input", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1420,7 +1420,7 @@ describe("saveLayouts should save layout changes", () => {
  });
  test("should update position of items when column count changes", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1447,7 +1447,7 @@ describe("saveLayouts should save layout changes", () => {
  });
  test("should remove layout when not present in input", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1466,7 +1466,7 @@ describe("saveLayouts should save layout changes", () => {
  });
  test("should fail when board not found", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    const { layoutId } = await createFullBoardAsync(db, "default");
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
 import { eq } from "@homarr/db";
 import { boards, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { throwIfActionForbiddenAsync } from "../../board/board-access";

@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
    ["view" as const, true],
  ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructBoardPermissions");
    spy.mockReturnValue({
      hasFullAccess: true,
@@ -55,7 +55,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
    ["view" as const, true],
  ])("with permission %s should return %s when hasChangeAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructBoardPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -84,7 +84,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
    ["view" as const, true],
  ])("with permission %s should return %s when hasViewAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructBoardPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -113,7 +113,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
    ["view" as const, false],
  ])("with permission %s should return %s when hasViewAccess is false", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructBoardPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -138,7 +138,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo

  test("should throw when board is not found", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();

    // Act
    const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full");
@@ -5,7 +5,7 @@ import * as env from "@homarr/auth/env";
 import { createId } from "@homarr/common";
 import { eq } from "@homarr/db";
 import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey } from "@homarr/definitions";

 import { groupRouter } from "../group";
@@ -37,7 +37,7 @@ describe("paginated should return a list of groups with pagination", () => {
    "with 5 groups in database and pageSize set to 3 on page %s it should return %s groups",
    async (page, expectedCount) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

      await db.insert(groups).values(
@@ -61,7 +61,7 @@ describe("paginated should return a list of groups with pagination", () => {

  test("with 5 groups in database and pagesize set to 3 it should return total count 5", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values(
@@ -83,7 +83,7 @@ describe("paginated should return a list of groups with pagination", () => {

  test("groups should contain id, name, email and image of members", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const user = createDummyUser();
@@ -120,7 +120,7 @@ describe("paginated should return a list of groups with pagination", () => {
    "groups should be searchable by name with contains pattern, query %s should result in %s results",
    async (query, expectedCount, firstKey) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

      await db.insert(groups).values(
@@ -144,7 +144,7 @@ describe("paginated should return a list of groups with pagination", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -158,7 +158,7 @@ describe("paginated should return a list of groups with pagination", () => {
 describe("byId should return group by id including members and permissions", () => {
  test('should return group with id "1" with members and permissions', async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const user = createDummyUser();
@@ -203,7 +203,7 @@ describe("byId should return group by id including members and permissions", ()

  test("with group id 1 and group 2 in database it should throw NOT_FOUND error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -221,7 +221,7 @@ describe("byId should return group by id including members and permissions", ()

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -235,7 +235,7 @@ describe("byId should return group by id including members and permissions", ()
 describe("create should create group in database", () => {
  test("with valid input (64 character name) and non existing name it should be successful", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const name = "a".repeat(64);
@@ -259,7 +259,7 @@ describe("create should create group in database", () => {

  test("with more than 64 characters name it should fail while validation", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
    const longName = "a".repeat(65);

@@ -280,7 +280,7 @@ describe("create should create group in database", () => {
    ["test", " TeSt"],
  ])("with similar name %s it should fail to create %s", async (similarName, nameToCreate) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -298,7 +298,7 @@ describe("create should create group in database", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -315,7 +315,7 @@ describe("update should update name with value that is no duplicate", () => {
    ["first", " first", "first"],
  ])("update should update name from %s to %s normalized", async (initialValue, updateValue, expectedValue) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const groupId = createId();
@@ -350,7 +350,7 @@ describe("update should update name with value that is no duplicate", () => {
    [" seCond", "second"],
  ])("with similar name %s it should fail to update %s", async (updateValue, initialDuplicate) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const groupId = createId();
@@ -380,7 +380,7 @@ describe("update should update name with value that is no duplicate", () => {

  test("with non existing id it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -402,7 +402,7 @@ describe("update should update name with value that is no duplicate", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -420,7 +420,7 @@ describe("update should update name with value that is no duplicate", () => {
 describe("savePermissions should save permissions for group", () => {
  test("with existing group and permissions it should save permissions", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const groupId = createId();
@@ -451,7 +451,7 @@ describe("savePermissions should save permissions for group", () => {

  test("with non existing group it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -473,7 +473,7 @@ describe("savePermissions should save permissions for group", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -491,7 +491,7 @@ describe("savePermissions should save permissions for group", () => {
 describe("transferOwnership should transfer ownership of group", () => {
  test("with existing group and user it should transfer ownership", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const groupId = createId();
@@ -529,7 +529,7 @@ describe("transferOwnership should transfer ownership of group", () => {

  test("with non existing group it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -551,7 +551,7 @@ describe("transferOwnership should transfer ownership of group", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -569,7 +569,7 @@ describe("transferOwnership should transfer ownership of group", () => {
 describe("deleteGroup should delete group", () => {
  test("with existing group it should delete group", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    const groupId = createId();
@@ -600,7 +600,7 @@ describe("deleteGroup should delete group", () => {

  test("with non existing group it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(groups).values({
@@ -621,7 +621,7 @@ describe("deleteGroup should delete group", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -638,7 +638,7 @@ describe("deleteGroup should delete group", () => {
 describe("addMember should add member to group", () => {
  test("with existing group and user it should add member", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(env, "env", "get");
    spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -679,7 +679,7 @@ describe("addMember should add member to group", () => {

  test("with non existing group it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(users).values({
@@ -700,7 +700,7 @@ describe("addMember should add member to group", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -716,7 +716,7 @@ describe("addMember should add member to group", () => {

  test("without credentials provider it should throw FORBIDDEN error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(env, "env", "get");
    spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -755,7 +755,7 @@ describe("addMember should add member to group", () => {
 describe("removeMember should remove member from group", () => {
  test("with existing group and user it should remove member", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(env, "env", "get");
    spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -799,7 +799,7 @@ describe("removeMember should remove member from group", () => {

  test("with non existing group it should throw not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });

    await db.insert(users).values({
@@ -820,7 +820,7 @@ describe("removeMember should remove member from group", () => {

  test("without admin permissions it should throw unauthorized error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });

    // Act
@@ -836,7 +836,7 @@ describe("removeMember should remove member from group", () => {

  test("without credentials provider it should throw FORBIDDEN error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(env, "env", "get");
    spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
    const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
 import { createId } from "@homarr/common";
 import { eq } from "@homarr/db";
 import { integrations, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { throwIfActionForbiddenAsync } from "../../integration/integration-access";

@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
    ["use" as const, true],
  ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
    spy.mockReturnValue({
      hasFullAccess: true,
@@ -56,7 +56,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
    ["use" as const, true],
  ])("with permission %s should return %s when hasInteractAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -87,7 +87,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
    ["use" as const, true],
  ])("with permission %s should return %s when hasUseAccess is true", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -118,7 +118,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
    ["use" as const, false],
  ])("with permission %s should return %s when hasUseAccess is false", async (permission, expectedResult) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
    spy.mockReturnValue({
      hasFullAccess: false,
@@ -145,7 +145,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret

  test("should throw when integration is not found", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();

    // Act
    const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(integrations.id, createId()), "full");
@@ -5,7 +5,7 @@ import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { encryptSecret } from "@homarr/common/server";
 import { apps, integrations, integrationSecrets } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey } from "@homarr/definitions";

 import { integrationRouter } from "../../integration/integration-router";
@@ -30,7 +30,7 @@ vi.mock("../../integration/integration-test-connection", () => ({

 describe("all should return all integrations", () => {
  test("with any session should return all integrations", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -61,7 +61,7 @@ describe("all should return all integrations", () => {

 describe("byId should return an integration by id", () => {
  test("with full access should return an integration by id", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -88,7 +88,7 @@ describe("byId should return an integration by id", () => {
  });

  test("with full access should throw an error if the integration does not exist", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -100,7 +100,7 @@ describe("byId should return an integration by id", () => {
  });

  test("with full access should only return the public secret values", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -148,7 +148,7 @@ describe("byId should return an integration by id", () => {

  test("without full access should throw integration not found error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -174,7 +174,7 @@ describe("byId should return an integration by id", () => {

 describe("create should create a new integration", () => {
  test("with create integration access should create a new integration", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -209,7 +209,7 @@ describe("create should create a new integration", () => {
  });

  test("with create integration access should create a new integration when creating search engine", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -252,7 +252,7 @@ describe("create should create a new integration", () => {
  });

  test("with create integration access should create a new integration with new linked app", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -302,7 +302,7 @@ describe("create should create a new integration", () => {
  });

  test("with create integration access should create a new integration with existing linked app", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const appId = createId();
    await db.insert(apps).values({
      id: appId,
@@ -349,7 +349,7 @@ describe("create should create a new integration", () => {

  test("without create integration access should throw permission error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -372,7 +372,7 @@ describe("create should create a new integration", () => {

  test("without create app access should throw permission error with new linked app", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -403,7 +403,7 @@ describe("create should create a new integration", () => {

 describe("update should update an integration", () => {
  test("with full access should update an integration", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -486,7 +486,7 @@ describe("update should update an integration", () => {
  });

  test("with full access should throw an error if the integration does not exist", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -506,7 +506,7 @@ describe("update should update an integration", () => {

  test("without full access should throw permission error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -530,7 +530,7 @@ describe("update should update an integration", () => {

 describe("delete should delete an integration", () => {
  test("with full access should delete an integration", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -564,7 +564,7 @@ describe("delete should delete an integration", () => {

  test("without full access should throw permission error", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = integrationRouter.createCaller({
      db,
      deviceType: undefined,
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { invites, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { inviteRouter } from "../invite";

@@ -35,7 +35,7 @@ vi.mock("@homarr/auth/env", () => {
 describe("all should return all existing invites without sensitive informations", () => {
  test("invites should not contain sensitive informations", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = inviteRouter.createCaller({
      db,
      deviceType: undefined,
@@ -70,7 +70,7 @@ describe("all should return all existing invites without sensitive informations"

  test("invites should be sorted ascending by expiration date", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = inviteRouter.createCaller({
      db,
      deviceType: undefined,
@@ -110,7 +110,7 @@ describe("all should return all existing invites without sensitive informations"
 describe("create should create a new invite expiring on the specified date with a token and id returned to generate url", () => {
  test("creation should work with a date in the future, but less than 6 months.", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = inviteRouter.createCaller({
      db,
      deviceType: undefined,
@@ -142,7 +142,7 @@ describe("create should create a new invite expiring on the specified date with
 describe("delete should remove invite by id", () => {
  test("deletion should remove present invite", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = inviteRouter.createCaller({
      db,
      deviceType: undefined,
@@ -180,7 +180,7 @@ describe("delete should remove invite by id", () => {

  test("deletion should throw with NOT_FOUND code when specified invite not present", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = inviteRouter.createCaller({
      db,
      deviceType: undefined,
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
 import type { Session } from "@homarr/auth";
 import { createId } from "@homarr/common";
 import { serverSettings } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";

 import { serverSettingsRouter } from "../serverSettings";
@@ -23,7 +23,7 @@ const defaultSession = {

 describe("getAll server settings", () => {
  test("getAll should throw error when unauthorized", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = serverSettingsRouter.createCaller({
      db,
      deviceType: undefined,
@@ -42,7 +42,7 @@ describe("getAll server settings", () => {
    await expect(actAsync()).rejects.toThrow();
  });
  test("getAll should return default server settings when nothing in database", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = serverSettingsRouter.createCaller({
      db,
      deviceType: undefined,
@@ -57,7 +57,7 @@ describe("getAll server settings", () => {

 describe("saveSettings", () => {
  test("saveSettings should update settings and return true when it updated only one", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = serverSettingsRouter.createCaller({
      db,
      deviceType: undefined,
@@ -5,7 +5,7 @@ import { createId } from "@homarr/common";
 import type { Database } from "@homarr/db";
 import { eq } from "@homarr/db";
 import { invites, onboarding, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";

 import { userRouter } from "../user";
@@ -39,7 +39,7 @@ vi.mock("@homarr/auth/env", () => {

 describe("initUser should initialize the first user", () => {
  it("should create a user if none exists", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    await createOnboardingStepAsync(db, "user");
    const caller = userRouter.createCaller({
      db,
@@ -63,7 +63,7 @@ describe("initUser should initialize the first user", () => {
  });

  it("should not create a user if the password and confirmPassword do not match", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    await createOnboardingStepAsync(db, "user");
    const caller = userRouter.createCaller({
      db,
@@ -88,7 +88,7 @@ describe("initUser should initialize the first user", () => {
    ["ABC123+/-"], // does not contain lowercase
    ["abc123+/-"], // does not contain uppercase
  ])("should throw error that password requirements do not match for '%s' as password", async (password) => {
-    const db = await createDbAsync();
+    const db = createDb();
    await createOnboardingStepAsync(db, "user");
    const caller = userRouter.createCaller({
      db,
@@ -110,7 +110,7 @@ describe("initUser should initialize the first user", () => {
 describe("register should create a user with valid invitation", () => {
  test("register should create a user with valid invitation", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = userRouter.createCaller({
      db,
      deviceType: undefined,
@@ -166,7 +166,7 @@ describe("register should create a user with valid invitation", () => {
    "register should throw an error with input %s and date %s if the invitation is invalid",
    async (partialInput, systemTime) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const caller = userRouter.createCaller({
        db,
        deviceType: undefined,
@@ -209,7 +209,7 @@ describe("register should create a user with valid invitation", () => {
 describe("editProfile shoud update user", () => {
  test("editProfile should update users and not update emailVerified when email not dirty", async () => {
    // arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = userRouter.createCaller({
      db,
      deviceType: undefined,
@@ -246,7 +246,7 @@ describe("editProfile shoud update user", () => {

  test("editProfile should update users and update emailVerified when email dirty", async () => {
    // arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = userRouter.createCaller({
      db,
      deviceType: undefined,
@@ -282,7 +282,7 @@ describe("editProfile shoud update user", () => {

 describe("delete should delete user", () => {
  test("delete should delete user", async () => {
-    const db = await createDbAsync();
+    const db = createDb();
    const caller = userRouter.createCaller({
      db,
      deviceType: undefined,
@@ -1,7 +1,10 @@
 import { describe, expect, test, vi } from "vitest";

 import type { Session } from "@homarr/auth";
-import { createDbAsync } from "@homarr/db/test";
+import { createId } from "@homarr/common";
+import type { InferInsertModel } from "@homarr/db";
+import { apps } from "@homarr/db/schema";
+import { createDb } from "@homarr/db/test";
 import * as ping from "@homarr/ping";

 import { appRouter } from "../../widgets/app";
@@ -9,22 +12,31 @@ import { appRouter } from "../../widgets/app";
 // Mock the auth module to return an empty session
 vi.mock("@homarr/auth", () => ({ auth: () => ({}) as Session }));
 vi.mock("@homarr/ping", () => ({ sendPingRequestAsync: async () => await Promise.resolve(null) }));
+vi.mock("../../app/app-access-control", () => ({
+  AppAccessControl: vi.fn(
+    class {
+      canUserSeeAppAsync = async (_: string) => await Promise.resolve(true);
+      canUserSeeAppsAsync = async (_: string[]) => await Promise.resolve(true);
+    },
+  ),
+}));

 describe("ping should call sendPingRequestAsync with url and return result", () => {
  test("ping with error response should return error and url", async () => {
    // Arrange
-    const spy = vi.spyOn(ping, "sendPingRequestAsync");
+    vi.spyOn(ping, "sendPingRequestAsync").mockImplementation(() => Promise.resolve({ error: "error" }));
    const url = "http://localhost";
-    const db = await createDbAsync();
+    const db = createDb();
+    const app = createApp({ url });
+    await db.insert(apps).values(app);
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
      session: null,
    });
-    spy.mockImplementation(() => Promise.resolve({ error: "error" }));

    // Act
-    const result = await caller.ping({ url });
+    const result = await caller.ping({ id: app.id });

    // Assert
    expect(result.url).toBe(url);
@@ -33,21 +45,32 @@ describe("ping should call sendPingRequestAsync with url and return result", ()

  test("ping with success response should return statusCode and url", async () => {
    // Arrange
-    const spy = vi.spyOn(ping, "sendPingRequestAsync");
+    vi.spyOn(ping, "sendPingRequestAsync").mockImplementation(() =>
+      Promise.resolve({ statusCode: 200, durationMs: 123 }),
+    );
    const url = "http://localhost";
-    const db = await createDbAsync();
+    const db = createDb();
+    const app = createApp({ url });
+    await db.insert(apps).values(app);
    const caller = appRouter.createCaller({
      db,
      deviceType: undefined,
      session: null,
    });
-    spy.mockImplementation(() => Promise.resolve({ statusCode: 200, durationMs: 123 }));

    // Act
-    const result = await caller.ping({ url });
+    const result = await caller.ping({ id: app.id });

    // Assert
    expect(result.url).toBe(url);
    expect("statusCode" in result).toBe(true);
  });
 });
+
+const createApp = ({ url }: { url: string }) =>
+  ({
+    id: createId(),
+    iconUrl: "",
+    name: "Test App",
+    href: url,
+  }) satisfies InferInsertModel<typeof apps>;
@@ -1,43 +1,97 @@
+import { TRPCError } from "@trpc/server";
 import { observable } from "@trpc/server/observable";
 import { z } from "zod/v4";

+import { getServerSettingByKeyAsync } from "@homarr/db/queries";
 import { sendPingRequestAsync } from "@homarr/ping";
 import { pingChannel, pingUrlChannel } from "@homarr/redis";

 import { createTRPCRouter, publicProcedure } from "../../trpc";
+import { AppRepository } from "../app";

 export const appRouter = createTRPCRouter({
-  ping: publicProcedure.input(z.object({ url: z.string() })).query(async ({ input }) => {
-    const pingResult = await sendPingRequestAsync(input.url);
+  ping: publicProcedure.input(z.object({ id: z.string() })).query(async ({ ctx, input }) => {
+    const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board");
+    if (boardSettings.forceDisableStatus) {
+      throw new TRPCError({
+        code: "FORBIDDEN",
+        message: "Ping functionality is disabled by server settings",
+      });
+    }
+
+    const repository = new AppRepository(ctx.db, ctx.session?.user ?? null);
+    const app = await repository.getByIdAsync(input.id);
+
+    if (!app) {
+      throw new TRPCError({
+        code: "NOT_FOUND",
+        message: "App not found",
+      });
+    }
+
+    const pingUrl = app.pingUrl ?? app.href;
+
+    if (!pingUrl) {
+      throw new TRPCError({
+        code: "CONFLICT",
+        message: "No URL to ping configured for this app",
+      });
+    }
+
+    const pingResult = await sendPingRequestAsync(pingUrl);

    return {
-      url: input.url,
+      url: pingUrl,
      ...pingResult,
    };
  }),
  updatedPing: publicProcedure
    .input(
      z.object({
-        url: z.string(),
+        id: z.string(),
      }),
    )
-    .subscription(async ({ input }) => {
-      await pingUrlChannel.addAsync(input.url);
+    .subscription(async ({ ctx, input }) => {
+      const boardSettings = await getServerSettingByKeyAsync(ctx.db, "board");
+      if (boardSettings.forceDisableStatus) {
+        throw new TRPCError({
+          code: "FORBIDDEN",
+          message: "Ping functionality is disabled by server settings",
+        });
+      }

-      const pingResult = await sendPingRequestAsync(input.url);
+      const repository = new AppRepository(ctx.db, ctx.session?.user ?? null);
+      const app = await repository.getByIdAsync(input.id);
+
+      if (!app) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "App not found",
+        });
+      }
+
+      const pingUrl = app.pingUrl ?? app.href;
+
+      if (!pingUrl) {
+        throw new TRPCError({
+          code: "CONFLICT",
+          message: "No URL to ping configured for this app",
+        });
+      }
+
+      await pingUrlChannel.addAsync(pingUrl);

      return observable<{ url: string; statusCode: number; durationMs: number } | { url: string; error: string }>(
        (emit) => {
-          emit.next({ url: input.url, ...pingResult });
          const unsubscribe = pingChannel.subscribe((message) => {
            // Only emit if same url
-            if (message.url !== input.url) return;
+            if (message.url !== pingUrl) return;
            emit.next(message);
          });

          return () => {
            unsubscribe();
-            void pingUrlChannel.removeAsync(input.url);
+            void pingUrlChannel.removeAsync(pingUrl);
          };
        },
      );
@@ -0,0 +1,50 @@
+import { observable } from "@trpc/server/observable";
+
+import type { CoolifyInstanceInfo } from "@homarr/integrations/types";
+import { coolifyRequestHandler } from "@homarr/request-handler/coolify";
+
+import { createManyIntegrationMiddleware } from "../../middlewares/integration";
+import { createTRPCRouter, publicProcedure } from "../../trpc";
+
+export const coolifyRouter = createTRPCRouter({
+  getInstancesInfo: publicProcedure
+    .concat(createManyIntegrationMiddleware("query", "coolify"))
+    .query(async ({ ctx }) => {
+      const results = await Promise.all(
+        ctx.integrations.map(async (integration) => {
+          const innerHandler = coolifyRequestHandler.handler(integration, {});
+          const { data, timestamp } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+
+          return {
+            integrationId: integration.id,
+            integrationName: integration.name,
+            integrationUrl: integration.url,
+            instanceInfo: data,
+            updatedAt: timestamp,
+          };
+        }),
+      );
+
+      return results;
+    }),
+  subscribeInstancesInfo: publicProcedure
+    .concat(createManyIntegrationMiddleware("query", "coolify"))
+    .subscription(({ ctx }) => {
+      return observable<{ integrationId: string; instanceInfo: CoolifyInstanceInfo; timestamp: Date }>((emit) => {
+        const unsubscribes = ctx.integrations.map((integration) => {
+          const innerHandler = coolifyRequestHandler.handler(integration, {});
+          return innerHandler.subscribe((instanceInfo) => {
+            emit.next({
+              integrationId: integration.id,
+              instanceInfo,
+              timestamp: new Date(),
+            });
+          });
+        });
+
+        return () => {
+          unsubscribes.forEach((unsubscribe) => unsubscribe());
+        };
+      });
+    }),
+});
@@ -1,46 +1,28 @@
+import { lazy } from "@trpc/server";
+
 import { createTRPCRouter } from "../../trpc";
-import { appRouter } from "./app";
-import { calendarRouter } from "./calendar";
-import { dnsHoleRouter } from "./dns-hole";
-import { downloadsRouter } from "./downloads";
-import { firewallRouter } from "./firewall";
-import { healthMonitoringRouter } from "./health-monitoring";
-import { indexerManagerRouter } from "./indexer-manager";
-import { mediaReleaseRouter } from "./media-release";
-import { mediaRequestsRouter } from "./media-requests";
-import { mediaServerRouter } from "./media-server";
-import { mediaTranscodingRouter } from "./media-transcoding";
-import { minecraftRouter } from "./minecraft";
-import { networkControllerRouter } from "./network-controller";
-import { notebookRouter } from "./notebook";
-import { notificationsRouter } from "./notifications";
-import { optionsRouter } from "./options";
-import { releasesRouter } from "./releases";
-import { rssFeedRouter } from "./rssFeed";
-import { smartHomeRouter } from "./smart-home";
-import { stockPriceRouter } from "./stocks";
-import { weatherRouter } from "./weather";

 export const widgetRouter = createTRPCRouter({
-  notebook: notebookRouter,
-  weather: weatherRouter,
-  app: appRouter,
-  dnsHole: dnsHoleRouter,
-  smartHome: smartHomeRouter,
-  stockPrice: stockPriceRouter,
-  mediaServer: mediaServerRouter,
-  mediaRelease: mediaReleaseRouter,
-  calendar: calendarRouter,
-  downloads: downloadsRouter,
-  mediaRequests: mediaRequestsRouter,
-  rssFeed: rssFeedRouter,
-  indexerManager: indexerManagerRouter,
-  healthMonitoring: healthMonitoringRouter,
-  mediaTranscoding: mediaTranscodingRouter,
-  minecraft: minecraftRouter,
-  options: optionsRouter,
-  releases: releasesRouter,
-  networkController: networkControllerRouter,
-  firewall: firewallRouter,
-  notifications: notificationsRouter,
+  coolify: lazy(() => import("./coolify").then((mod) => mod.coolifyRouter)),
+  notebook: lazy(() => import("./notebook").then((mod) => mod.notebookRouter)),
+  weather: lazy(() => import("./weather").then((mod) => mod.weatherRouter)),
+  app: lazy(() => import("./app").then((mod) => mod.appRouter)),
+  dnsHole: lazy(() => import("./dns-hole").then((mod) => mod.dnsHoleRouter)),
+  smartHome: lazy(() => import("./smart-home").then((mod) => mod.smartHomeRouter)),
+  stockPrice: lazy(() => import("./stocks").then((mod) => mod.stockPriceRouter)),
+  mediaServer: lazy(() => import("./media-server").then((mod) => mod.mediaServerRouter)),
+  mediaRelease: lazy(() => import("./media-release").then((mod) => mod.mediaReleaseRouter)),
+  calendar: lazy(() => import("./calendar").then((mod) => mod.calendarRouter)),
+  downloads: lazy(() => import("./downloads").then((mod) => mod.downloadsRouter)),
+  mediaRequests: lazy(() => import("./media-requests").then((mod) => mod.mediaRequestsRouter)),
+  rssFeed: lazy(() => import("./rssFeed").then((mod) => mod.rssFeedRouter)),
+  indexerManager: lazy(() => import("./indexer-manager").then((mod) => mod.indexerManagerRouter)),
+  healthMonitoring: lazy(() => import("./health-monitoring").then((mod) => mod.healthMonitoringRouter)),
+  mediaTranscoding: lazy(() => import("./media-transcoding").then((mod) => mod.mediaTranscodingRouter)),
+  minecraft: lazy(() => import("./minecraft").then((mod) => mod.minecraftRouter)),
+  options: lazy(() => import("./options").then((mod) => mod.optionsRouter)),
+  releases: lazy(() => import("./releases").then((mod) => mod.releasesRouter)),
+  networkController: lazy(() => import("./network-controller").then((mod) => mod.networkControllerRouter)),
+  firewall: lazy(() => import("./firewall").then((mod) => mod.firewallRouter)),
+  notifications: lazy(() => import("./notifications").then((mod) => mod.notificationsRouter)),
 });
@@ -33,11 +33,11 @@
    "@homarr/validation": "workspace:^0.1.0",
    "bcrypt": "^6.0.0",
    "cookies": "^0.9.1",
-    "ldapts": "8.1.3",
-    "next": "16.1.1",
+    "ldapts": "8.1.6",
+    "next": "16.1.6",
    "next-auth": "5.0.0-beta.30",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
    "zod": "^4.2.1"
  },
  "devDependencies": {
@@ -47,7 +47,7 @@
    "@types/bcrypt": "6.0.0",
    "@types/cookies": "0.9.2",
    "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "typescript": "^5.9.3"
  }
 }
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
 import { createId } from "@homarr/common";
 import type { InferInsertModel } from "@homarr/db";
 import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import * as integrationPermissions from "../integration-permissions";
 import { hasQueryAccessToIntegrationsAsync } from "../integration-query-permissions";
@@ -22,7 +22,7 @@ const createSession = (user: Partial<Session["user"]>): Session => ({
 describe("hasQueryAccessToIntegrationsAsync should check if the user has query access to the specified integrations", () => {
  test("should return true if the user has the board-view-all permission and the integrations are used anywhere", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({
      permissions: ["board-view-all"],
    });
@@ -50,7 +50,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user has the board-view-all permission, the first integration is used and the second one he has use access", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({
      permissions: ["board-view-all"],
    });
@@ -84,7 +84,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user has use access to all integrations", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
    spy.mockReturnValue({
@@ -116,7 +116,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user has user permission to access to at least one board of each integration", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -168,7 +168,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return false if the user has user permission to access board of first integration but not of second one", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -215,7 +215,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user has group permission to access to at least one board of each integration", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -269,7 +269,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return false if the user has group permission to access board of first integration but not of second one", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -318,7 +318,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user has user permission to access first board and group permission to access second one", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -369,7 +369,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if one of the boards the integration is used is public", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    const integrations = [
      {
@@ -413,7 +413,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user is creator of the board the integration is used", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    await db.insert(users).values({ id: session.user.id });
    const integrations = [
@@ -458,7 +458,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return false if the user has no access to any of the integrations", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const session = createSession({});
    const integrations = [
      {
@@ -496,7 +496,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return false if the user is anonymous and the board is not public", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const integrations = [
      {
        id: "1",
@@ -534,7 +534,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a

  test("should return true if the user is anonymous and the board is public", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const integrations = [
      {
        id: "1",
@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";

 import { createId } from "@homarr/common";
 import { users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { createSaltAsync, hashPasswordAsync } from "../../security";
 import { authorizeWithBasicCredentialsAsync } from "../credentials/authorization/basic-authorization";
@@ -12,7 +12,7 @@ const defaultUserId = createId();
 describe("authorizeWithBasicCredentials", () => {
  test("should authorize user with correct credentials", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const salt = await createSaltAsync();
    await db.insert(users).values({
      id: defaultUserId,
@@ -33,7 +33,7 @@ describe("authorizeWithBasicCredentials", () => {

  test("should not authorize user with incorrect credentials", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const salt = await createSaltAsync();
    await db.insert(users).values({
      id: defaultUserId,
@@ -54,7 +54,7 @@ describe("authorizeWithBasicCredentials", () => {

  test("should not authorize user with incorrect username", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const salt = await createSaltAsync();
    await db.insert(users).values({
      id: defaultUserId,
@@ -75,7 +75,7 @@ describe("authorizeWithBasicCredentials", () => {

  test("should not authorize user when password is not set", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    await db.insert(users).values({
      id: defaultUserId,
      name: "test",
@@ -5,7 +5,7 @@ import { createId } from "@homarr/common";
 import type { Database } from "@homarr/db";
 import { and, eq } from "@homarr/db";
 import { groups, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization";
 import * as ldapClient from "../credentials/ldap-client";
@@ -123,7 +123,7 @@ describe("authorizeWithLdapCredentials", () => {

  test("should authorize user with correct credentials and create user", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(ldapClient, "LdapClient");
    spy.mockImplementation(function () {
      return {
@@ -161,7 +161,7 @@ describe("authorizeWithLdapCredentials", () => {

  test("should authorize user with correct credentials and create user with same email when credentials user already exists", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const spy = vi.spyOn(ldapClient, "LdapClient");
    spy.mockImplementation(function () {
      return {
@@ -230,7 +230,7 @@ describe("authorizeWithLdapCredentials", () => {
    });

    const userId = createId();
-    const db = await createDbAsync();
+    const db = createDb();
    await db.insert(users).values({
      id: userId,
      name: "test-old",
@@ -281,7 +281,7 @@ describe("authorizeWithLdapCredentials", () => {
        disconnectAsync: vi.fn(),
      } as unknown as ldapClient.LdapClient;
    });
-    const db = await createDbAsync();
+    const db = createDb();
    const userId = createId();
    await db.insert(users).values({
      id: userId,
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest";

 import { users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { createAdapter } from "../adapter";

@@ -10,7 +10,7 @@ describe("createAdapter should create drizzle adapter", () => {
    "createAdapter getUserByEmail should return user for provider %s when this provider provided",
    async (provider) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const adapter = createAdapter(db, provider);
      const email = "test@example.com";
      await db.insert(users).values({ id: "1", name: "test", email, provider });
@@ -37,7 +37,7 @@ describe("createAdapter should create drizzle adapter", () => {
    "createAdapter getUserByEmail should return null if only for other providers than %s exist",
    async (requestedProvider, existingProviders) => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      const adapter = createAdapter(db, requestedProvider);
      const email = "test@example.com";
      for (const provider of existingProviders) {
@@ -54,7 +54,7 @@ describe("createAdapter should create drizzle adapter", () => {

  test("createAdapter getUserByEmail should throw error if provider is unknown", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const adapter = createAdapter(db, "unknown");
    const email = "test@example.com";

@@ -4,7 +4,7 @@ import type { JWT } from "next-auth/jwt";
 import { describe, expect, test, vi } from "vitest";

 import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import * as definitions from "@homarr/definitions";

 import { createSessionCallback, getCurrentUserPermissionsAsync } from "../callbacks";
@@ -20,7 +20,7 @@ vi.mock("next/headers", () => ({
 describe("getCurrentUserPermissions", () => {
  test("should return empty permissions when non existing user requested", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();

    await db.insert(groups).values({
      id: "2",
@@ -46,7 +46,7 @@ describe("getCurrentUserPermissions", () => {

  test("should return empty permissions when user has no groups", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const userId = "1";

    await db.insert(groups).values({
@@ -71,7 +71,7 @@ describe("getCurrentUserPermissions", () => {

  test("should return permissions for user", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    const getPermissionsWithChildrenMock = vi
      .spyOn(definitions, "getPermissionsWithChildren")
      .mockReturnValue(["board-create"]);
@@ -113,7 +113,7 @@ describe("session callback", () => {
      emailVerified: new Date("2023-01-13"),
    };
    const token: JWT = {};
-    const db = await createDbAsync();
+    const db = createDb();
    const callback = createSessionCallback(db);

    // Act
@@ -6,7 +6,7 @@ import { describe, expect, test, vi } from "vitest";
 import { eq } from "@homarr/db";
 import type { Database } from "@homarr/db";
 import { groupMembers, groups, users } from "@homarr/db/schema";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";
 import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";

 import { createSignInEventHandler } from "../events";
@@ -39,7 +39,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
  describe("signInEventHandler should add users to everyone group", () => {
    test("should add user to everyone group if he isn't already", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db, everyoneGroup);
      const eventHandler = createSignInEventHandler(db);
@@ -62,7 +62,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
  describe("signInEventHandler should synchronize ldap groups", () => {
    test("should add missing group membership", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db);
      const eventHandler = createSignInEventHandler(db);
@@ -82,7 +82,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
    });
    test("should remove group membership", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db);
      await db.insert(groupMembers).values({
@@ -106,7 +106,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
    });
    test("should not remove group membership for everyone group", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db, everyoneGroup);
      await db.insert(groupMembers).values({
@@ -132,7 +132,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
  describe("signInEventHandler should synchronize oidc groups", () => {
    test("should add missing group membership", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db);
      const eventHandler = createSignInEventHandler(db);
@@ -152,7 +152,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
    });
    test("should remove group membership", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db);
      await db.insert(groupMembers).values({
@@ -176,7 +176,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
    });
    test("should not remove group membership for everyone group", async () => {
      // Arrange
-      const db = await createDbAsync();
+      const db = createDb();
      await createUserAsync(db);
      await createGroupAsync(db, everyoneGroup);
      await db.insert(groupMembers).values({
@@ -205,7 +205,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
    ["oidc" as const, { name: "test" }, { preferred_username: "test@example.com", name: "test-new" }],
  ])("signInEventHandler should update username for %s provider", async (_provider, user, profile) => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    await createUserAsync(db);
    const eventHandler = createSignInEventHandler(db);

@@ -227,7 +227,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
  });
  test("signInEventHandler should set color-scheme cookie", async () => {
    // Arrange
-    const db = await createDbAsync();
+    const db = createDb();
    await createUserAsync(db);
    const eventHandler = createSignInEventHandler(db);

@@ -25,8 +25,8 @@
  "prettier": "@homarr/prettier-config",
  "dependencies": {
    "@homarr/api": "workspace:^0.1.0",
-    "react": "19.2.3",
-    "react-dom": "19.2.3"
+    "react": "19.2.4",
+    "react-dom": "19.2.4"
  },
  "devDependencies": {
    "@homarr/eslint-config": "workspace:^0.2.0",
@@ -28,13 +28,13 @@
    "@homarr/common": "workspace:^0.1.0",
    "@homarr/db": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "dotenv": "^17.2.3"
+    "dotenv": "^17.2.4"
  },
  "devDependencies": {
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.3",
    "eslint": "^9.39.2",
    "typescript": "^5.9.3"
  }
@@ -27,12 +27,13 @@
  "prettier": "@homarr/prettier-config",
  "dependencies": {
    "@homarr/core": "workspace:^0.1.0",
-    "@paralleldrive/cuid2": "^3.1.0",
+    "@paralleldrive/cuid2": "^3.3.0",
+    "cookie": "1.1.1",
    "dayjs": "^1.11.19",
-    "next": "16.1.1",
+    "next": "16.1.6",
    "octokit": "^5.0.5",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
    "undici": "7.18.2",
    "zod": "^4.2.1",
    "zod-validation-error": "^5.0.0"
@@ -1,10 +1,10 @@
 import type { SerializeOptions } from "cookie";
-import { parse, serialize } from "cookie";
+import { parseCookie, stringifySetCookie } from "cookie";

 export function parseCookies(cookieString: string) {
-  return parse(cookieString);
+  return parseCookie(cookieString);
 }

 export function setClientCookie(name: string, value: string, options: SerializeOptions = {}) {
-  document.cookie = serialize(name, value, options);
+  document.cookie = stringifySetCookie(name, value, options);
 }
@@ -37,13 +37,13 @@
  },
  "prettier": "@homarr/prettier-config",
  "dependencies": {
-    "@libsql/client": "0.15.15",
    "@t3-oss/env-nextjs": "^0.13.10",
+    "better-sqlite3": "^12.6.2",
    "dns-caching": "^0.2.9",
    "drizzle-orm": "^0.45.1",
-    "ioredis": "5.9.1",
-    "mysql2": "3.16.0",
-    "pg": "^8.16.3",
+    "ioredis": "5.9.2",
+    "mysql2": "3.16.3",
+    "pg": "^8.18.0",
    "superjson": "2.2.6",
    "winston": "3.19.0",
    "zod": "^4.2.1"
@@ -52,6 +52,7 @@
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
+    "@types/better-sqlite3": "7.6.13",
    "@types/pg": "^8.16.0",
    "eslint": "^9.39.2",
    "typescript": "^5.9.3"
@@ -1,12 +1,10 @@
-import { createClient } from "@libsql/client/node";
-import { drizzle as drizzleSqlite } from "drizzle-orm/libsql";
+import Database from "better-sqlite3";
+import { drizzle as drizzleSqlite } from "drizzle-orm/better-sqlite3";

 import { dbEnv } from "../env";
 import type { SharedDrizzleConfig } from "./shared";

 export const createSqliteDb = <TSchema extends Record<string, unknown>>(config: SharedDrizzleConfig<TSchema>) => {
-  const connection = createClient({
-    url: dbEnv.URL ? `file:${dbEnv.URL}` : ":memory:",
-  });
+  const connection = new Database(dbEnv.URL);
  return drizzleSqlite<TSchema>(connection, config);
 };
@@ -28,12 +28,12 @@
    "@homarr/common": "workspace:^0.1.0",
    "@homarr/core": "workspace:^0.1.0",
    "@homarr/cron-jobs": "workspace:^0.1.0",
-    "@tanstack/react-query": "^5.90.16",
-    "@trpc/client": "^11.8.1",
-    "@trpc/server": "^11.8.1",
-    "@trpc/tanstack-react-query": "^11.8.1",
+    "@tanstack/react-query": "^5.90.20",
+    "@trpc/client": "^11.9.0",
+    "@trpc/server": "^11.9.0",
+    "@trpc/tanstack-react-query": "^11.9.0",
    "node-cron": "^4.2.1",
-    "react": "19.2.3",
+    "react": "19.2.4",
    "zod": "^4.2.1"
  },
  "devDependencies": {
@@ -41,7 +41,7 @@
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
    "@types/node-cron": "^3.0.11",
-    "@types/react": "19.2.8",
+    "@types/react": "19.2.13",
    "eslint": "^9.39.2",
    "typescript": "^5.9.3"
  }
@@ -3,7 +3,7 @@ import { env } from "@homarr/common/env";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import { EVERY_WEEK } from "@homarr/cron-jobs-core/expressions";
 import type { InferInsertModel } from "@homarr/db";
-import { db, inArray, sql } from "@homarr/db";
+import { db, handleTransactionsAsync, inArray, sql } from "@homarr/db";
 import { iconRepositories, icons } from "@homarr/db/schema";
 import { fetchIconsAsync } from "@homarr/icons";

@@ -89,37 +89,81 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
    (iconRepository) => !repositoryIconGroups.some((group) => group.slug === iconRepository.slug),
  );

-  await db.transaction(async (transaction) => {
-    if (newIconRepositories.length >= 1) {
-      await transaction.insert(iconRepositories).values(newIconRepositories);
-    }
+  await handleTransactionsAsync(db, {
+    async handleAsync(db, schema) {
+      await db.transaction(async (transaction) => {
+        if (newIconRepositories.length >= 1) {
+          await transaction.insert(schema.iconRepositories).values(newIconRepositories);
+        }

-    if (newIcons.length >= 1) {
-      // We only insert 5000 icons at a time to avoid SQLite limitations
-      for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
-        await transaction.insert(icons).values(chunck);
-      }
-    }
-    if (deadIcons.length >= 1) {
-      await transaction.delete(icons).where(
-        inArray(
-          // Combine iconRepositoryId and checksum to allow same icons on different repositories
-          sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
-          deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
-        ),
-      );
-    }
+        if (newIcons.length >= 1) {
+          // We only insert 5000 icons at a time to avoid SQLite limitations
+          for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
+            await transaction.insert(schema.icons).values(chunck);
+          }
+        }
+        if (deadIcons.length >= 1) {
+          await transaction.delete(schema.icons).where(
+            inArray(
+              // Combine iconRepositoryId and checksum to allow same icons on different repositories
+              sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
+              deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
+            ),
+          );
+        }

-    if (deadIconRepositories.length >= 1) {
-      await transaction.delete(iconRepositories).where(
-        inArray(
-          iconRepositories.id,
-          deadIconRepositories.map((iconRepository) => iconRepository.id),
-        ),
-      );
-    }
+        if (deadIconRepositories.length >= 1) {
+          await transaction.delete(schema.iconRepositories).where(
+            inArray(
+              iconRepositories.id,
+              deadIconRepositories.map((iconRepository) => iconRepository.id),
+            ),
+          );
+        }

-    countDeleted += deadIcons.length;
+        countDeleted += deadIcons.length;
+      });
+    },
+    handleSync() {
+      db.transaction((transaction) => {
+        if (newIconRepositories.length >= 1) {
+          transaction.insert(iconRepositories).values(newIconRepositories).run();
+        }
+
+        if (newIcons.length >= 1) {
+          // We only insert 5000 icons at a time to avoid SQLite limitations
+          for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
+            transaction.insert(icons).values(chunck).run();
+          }
+        }
+        if (deadIcons.length >= 1) {
+          transaction
+            .delete(icons)
+            .where(
+              inArray(
+                // Combine iconRepositoryId and checksum to allow same icons on different repositories
+                sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
+                deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
+              ),
+            )
+            .run();
+        }
+
+        if (deadIconRepositories.length >= 1) {
+          transaction
+            .delete(iconRepositories)
+            .where(
+              inArray(
+                iconRepositories.id,
+                deadIconRepositories.map((iconRepository) => iconRepository.id),
+              ),
+            )
+            .run();
+        }
+
+        countDeleted += deadIcons.length;
+      });
+    },
  });

  logger.info("Updated icons in database", {
@@ -1,4 +1,5 @@
 import { EVERY_5_SECONDS } from "@homarr/cron-jobs-core/expressions";
+import { coolifyRequestHandler } from "@homarr/request-handler/coolify";
 import { clusterInfoRequestHandler, systemInfoRequestHandler } from "@homarr/request-handler/health-monitoring";
 import { createRequestIntegrationJobHandler } from "@homarr/request-handler/lib/cached-request-integration-job-handler";

@@ -9,16 +10,20 @@ export const healthMonitoringJob = createCronJob("healthMonitoring", EVERY_5_SEC
    (integration, itemOptions: Record<string, never>) => {
      const { kind } = integration;

-      if (kind !== "proxmox" && kind !== "mock") {
+      if (kind !== "proxmox" && kind !== "mock" && kind !== "coolify") {
        return systemInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
      }
+      if (kind === "coolify") {
+        return coolifyRequestHandler.handler({ ...integration, kind }, itemOptions);
+      }
      return clusterInfoRequestHandler.handler({ ...integration, kind }, itemOptions);
    },
    {
-      widgetKinds: ["healthMonitoring", "systemResources"],
+      widgetKinds: ["healthMonitoring", "systemResources", "coolify"],
      getInput: {
        healthMonitoring: () => ({}),
        systemResources: () => ({}),
+        coolify: () => ({}),
      },
    },
  ),
@@ -1,15 +1,26 @@
 import type { InferInsertModel } from "drizzle-orm";

 import { objectEntries } from "@homarr/common";
+import { dbEnv } from "@homarr/core/infrastructure/db/env";

-import type { HomarrDatabase, HomarrTransaction } from "./driver";
+import type { HomarrDatabase, HomarrDatabaseMysql, HomarrDatabasePostgresql } from "./driver";
 import * as schema from "./schema";

 type TableKey = {
  [K in keyof typeof schema]: (typeof schema)[K] extends { _: { brand: "Table" } } ? K : never;
 }[keyof typeof schema];

-export const createDbInsertCollection = <TTableKey extends TableKey>(tablesInInsertOrder: TTableKey[]) => {
+export function isMysql(): boolean {
+  return dbEnv.DRIVER === "mysql2";
+}
+
+export function isPostgresql(): boolean {
+  return dbEnv.DRIVER === "node-postgres";
+}
+
+export const createDbInsertCollectionForTransaction = <TTableKey extends TableKey>(
+  tablesInInsertOrder: TTableKey[],
+) => {
  const context = tablesInInsertOrder.reduce(
    (acc, key) => {
      acc[key] = [];
@@ -20,10 +31,25 @@ export const createDbInsertCollection = <TTableKey extends TableKey>(tablesInIns

  return {
    ...context,
-    insertAllAsync: async (db: HomarrDatabase | HomarrTransaction) => {
-      await db.transaction(async (transaction) => {
+    insertAll: (db: HomarrDatabase) => {
+      db.transaction((transaction) => {
        for (const [key, values] of objectEntries(context)) {
          if (values.length >= 1) {
+            transaction
+              .insert(schema[key])
+              .values(values as never)
+              .run();
+          }
+        }
+      });
+    },
+    // We allow any database that supports async passed here but then fallback to mysql to prevent typescript errors
+    insertAllAsync: async (db: HomarrDatabaseMysql | HomarrDatabasePostgresql) => {
+      const innerDb = db as HomarrDatabaseMysql;
+      await innerDb.transaction(async (transaction) => {
+        for (const [key, values] of objectEntries(context)) {
+          if (values.length >= 1) {
+            // Below is actually the mysqlSchema when the driver is mysql
            await transaction.insert(schema[key] as never).values(values as never);
          }
        }
@@ -31,3 +57,27 @@ export const createDbInsertCollection = <TTableKey extends TableKey>(tablesInIns
    },
  };
 };
+
+export const createDbInsertCollectionWithoutTransaction = <TTableKey extends TableKey>(
+  tablesInInsertOrder: TTableKey[],
+) => {
+  const { insertAll, insertAllAsync, ...collection } = createDbInsertCollectionForTransaction(tablesInInsertOrder);
+
+  return {
+    ...collection,
+    insertAllAsync: async (db: HomarrDatabase) => {
+      switch (dbEnv.DRIVER) {
+        case "mysql2":
+        case "node-postgres":
+          // For mysql2 and node-postgres, we can use the async insertAllAsync method
+          await insertAllAsync(db as unknown as HomarrDatabaseMysql | HomarrDatabasePostgresql);
+          return;
+        default:
+          // For better-sqlite3, we need to use the synchronous insertAll method
+          // default assumes better-sqlite3. It's original implementation.
+          insertAll(db);
+          break;
+      }
+    },
+  };
+};
@@ -7,6 +7,6 @@ export default {
  dialect: "sqlite",
  schema: "./schema",
  casing: DB_CASING,
-  dbCredentials: { url: `file:${dbEnv.URL}` },
+  dbCredentials: { url: dbEnv.URL },
  out: "./migrations/sqlite",
 } satisfies Config;
@@ -1,5 +1,4 @@
-import type { ExtractTablesWithRelations } from "drizzle-orm";
-import type { LibSQLDatabase, LibSQLTransaction } from "drizzle-orm/libsql";
+import type { BetterSQLite3Database } from "drizzle-orm/better-sqlite3";
 import type { MySql2Database } from "drizzle-orm/mysql2";
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";

@@ -7,7 +6,6 @@ import type * as mysqlSchema from "./schema/mysql";
 import type * as pgSchema from "./schema/postgresql";
 import type * as sqliteSchema from "./schema/sqlite";

-export type HomarrDatabase = LibSQLDatabase<typeof sqliteSchema>;
-export type HomarrTransaction = LibSQLTransaction<typeof sqliteSchema, ExtractTablesWithRelations<typeof sqliteSchema>>;
+export type HomarrDatabase = BetterSQLite3Database<typeof sqliteSchema>;
 export type HomarrDatabaseMysql = MySql2Database<typeof mysqlSchema>;
 export type HomarrDatabasePostgresql = NodePgDatabase<typeof pgSchema>;
@@ -8,3 +8,5 @@ export type { HomarrDatabaseMysql, HomarrDatabasePostgresql } from "./driver";
 export const db = createDb(schema);

 export type Database = typeof db;
+
+export { handleDiffrentDbDriverOperationsAsync as handleTransactionsAsync } from "./transactions";
@@ -1,4 +1,4 @@
-import { migrate } from "drizzle-orm/libsql/migrator";
+import { migrate } from "drizzle-orm/better-sqlite3/migrator";

 import { createSharedDbConfig, createSqliteDb } from "@homarr/core/infrastructure/db";

@@ -12,7 +12,7 @@ const migrateAsync = async () => {
  const config = createSharedDbConfig(sqliteSchema);
  const db = createSqliteDb(config);

-  await migrate(db, { migrationsFolder });
+  migrate(db, { migrationsFolder });

  await seedDataAsync(db);
  await applyCustomMigrationsAsync(db);
@@ -47,28 +47,29 @@
    "@homarr/core": "workspace:^0.1.0",
    "@homarr/definitions": "workspace:^0.1.0",
    "@homarr/server-settings": "workspace:^0.1.0",
-    "@libsql/client": "0.15.15",
-    "@mantine/core": "^8.3.12",
-    "@paralleldrive/cuid2": "^3.1.0",
+    "@mantine/core": "^8.3.14",
+    "@paralleldrive/cuid2": "^3.3.0",
    "@testcontainers/mysql": "^11.11.0",
    "@testcontainers/postgresql": "^11.11.0",
-    "dotenv": "^17.2.3",
+    "better-sqlite3": "^12.6.2",
+    "dotenv": "^17.2.4",
    "drizzle-kit": "^0.31.8",
    "drizzle-orm": "^0.45.1",
    "drizzle-zod": "^0.8.3",
-    "mysql2": "3.16.0",
-    "pg": "^8.16.3",
+    "mysql2": "3.16.3",
+    "pg": "^8.18.0",
    "superjson": "2.2.6"
  },
  "devDependencies": {
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
+    "@types/better-sqlite3": "7.6.13",
    "@types/pg": "^8.16.0",
    "dotenv-cli": "^11.0.0",
-    "esbuild": "^0.27.2",
+    "esbuild": "^0.27.3",
    "eslint": "^9.39.2",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
    "tsx": "4.20.4",
    "typescript": "^5.9.3"
  }
@@ -1,17 +1,15 @@
-import { createClient } from "@libsql/client/node";
-import { drizzle } from "drizzle-orm/libsql";
-import { migrate } from "drizzle-orm/libsql/migrator";
+import Database from "better-sqlite3";
+import { drizzle } from "drizzle-orm/better-sqlite3";
+import { migrate } from "drizzle-orm/better-sqlite3/migrator";

 import { DB_CASING } from "@homarr/core/infrastructure/db/constants";

 import * as sqliteSchema from "../schema/sqlite";

-export const createDbAsync = async (debug?: boolean) => {
-  const sqlite = createClient({
-    url: ":memory:",
-  });
+export const createDb = (debug?: boolean) => {
+  const sqlite = new Database(":memory:");
  const db = drizzle(sqlite, { schema: sqliteSchema, logger: debug, casing: DB_CASING });
-  await migrate(db, {
+  migrate(db, {
    migrationsFolder: "./packages/db/migrations/sqlite",
  });

@@ -0,0 +1,23 @@
+import { isMysql, isPostgresql } from "./collection";
+import type { HomarrDatabase, HomarrDatabaseMysql } from "./driver";
+import type { MySqlSchema } from "./schema";
+import * as schema from "./schema";
+
+interface HandleTransactionInput {
+  handleAsync: (db: HomarrDatabaseMysql, schema: MySqlSchema) => Promise<void>;
+  handleSync: (db: HomarrDatabase) => void;
+}
+
+/**
+ * The below method is mostly used to handle transactions in different database drivers.
+ * As better-sqlite3 transactions have to be synchronous, we have to implement them in a different way.
+ * But it can also generally be used when dealing with different database drivers.
+ */
+export const handleDiffrentDbDriverOperationsAsync = async (db: HomarrDatabase, input: HandleTransactionInput) => {
+  if (isMysql() || isPostgresql()) {
+    // Schema type is always the correct one based on env variables
+    await input.handleAsync(db as unknown as HomarrDatabaseMysql, schema as unknown as MySqlSchema);
+  } else {
+    input.handleSync(db);
+  }
+};
@@ -24,7 +24,7 @@
  "prettier": "@homarr/prettier-config",
  "dependencies": {
    "@homarr/common": "workspace:^0.1.0",
-    "fast-xml-parser": "^5.3.3",
+    "fast-xml-parser": "^5.3.5",
    "zod": "^4.2.1"
  },
  "devDependencies": {
@@ -305,6 +305,14 @@ export const integrationDefs = {
    category: ["healthMonitoring"],
    documentationUrl: createDocumentationLink("/docs/integrations/unraid"),
  },
+  coolify: {
+    name: "Coolify",
+    secretKinds: [["apiKey"]],
+    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/coolify.svg",
+    category: ["healthMonitoring"],
+    // @ts-expect-error - docs page will be created when integration is merged
+    documentationUrl: createDocumentationLink("/docs/integrations/coolify"),
+  },
  // This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
  mock: {
    name: "Mock",
@@ -29,5 +29,7 @@ export const widgetKinds = [
  "firewall",
  "notifications",
  "systemResources",
+  "coolify",
+  "systemDisks",
 ] as const;
 export type WidgetKind = (typeof widgetKinds)[number];
@@ -32,7 +32,7 @@
    "@homarr/eslint-config": "workspace:^0.2.0",
    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/dockerode": "^3.3.47",
+    "@types/dockerode": "^4.0.1",
    "eslint": "^9.39.2",
    "typescript": "^5.9.3"
  }
@@ -26,7 +26,7 @@
    "@homarr/common": "workspace:^0.1.0",
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "@mantine/form": "^8.3.12",
+    "@mantine/form": "^8.3.14",
    "mantine-form-zod-resolver": "^1.3.0",
    "zod": "^4.2.1"
  },
@@ -30,8 +30,8 @@
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/ui": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "@mantine/core": "^8.3.12",
-    "react": "19.2.3",
+    "@mantine/core": "^8.3.14",
+    "react": "19.2.4",
    "zod": "^4.2.1"
  },
  "devDependencies": {
@@ -39,13 +39,13 @@
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
    "@jellyfin/sdk": "^0.13.0",
-    "@octokit/auth-app": "^8.1.2",
+    "@octokit/auth-app": "^8.2.0",
    "ical.js": "^2.2.1",
    "maria2": "^0.4.1",
    "node-ical": "^0.22.1",
    "octokit": "^5.0.5",
    "proxmox-api": "1.1.1",
-    "tsdav": "^2.1.6",
+    "tsdav": "^2.1.7",
    "undici": "7.18.2",
    "xml2js": "^0.6.2",
    "zod": "^4.2.1"
@@ -2,6 +2,7 @@ import type { IntegrationKind } from "@homarr/definitions";

 import { AdGuardHomeIntegration } from "../adguard-home/adguard-home-integration";
 import { CodebergIntegration } from "../codeberg/codeberg-integration";
+import { CoolifyIntegration } from "../coolify/coolify-integration";
 import { DashDotIntegration } from "../dashdot/dashdot-integration";
 import { DockerHubIntegration } from "../docker-hub/docker-hub-integration";
 import { Aria2Integration } from "../download-client/aria2/aria2-integration";
@@ -103,6 +104,7 @@ export const integrationCreators = {
  mock: MockIntegration,
  truenas: TrueNasIntegration,
  unraid: UnraidIntegration,
+  coolify: CoolifyIntegration,
 } satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;

 type IntegrationInstanceOfKind<TKind extends keyof typeof integrationCreators> = {
@@ -0,0 +1,351 @@
+import { ResponseError } from "@homarr/common/server";
+import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
+
+import type { IntegrationTestingInput } from "../base/integration";
+import { Integration } from "../base/integration";
+import type { TestingResult } from "../base/test-connection/test-connection-service";
+import type {
+  CoolifyApplication,
+  CoolifyApplicationWithContext,
+  CoolifyEnvironment,
+  CoolifyEnvironmentVariable,
+  CoolifyHealthcheck,
+  CoolifyInstanceInfo,
+  CoolifyProject,
+  CoolifyProjectWithEnvironments,
+  CoolifyResource,
+  CoolifyServer,
+  CoolifyService,
+  CoolifyServiceWithContext,
+} from "./coolify-types";
+import {
+  coolifyApplicationLogSchema,
+  coolifyApplicationSchema,
+  coolifyEnvironmentSchema,
+  coolifyEnvironmentVariableSchema,
+  coolifyHealthcheckSchema,
+  coolifyProjectSchema,
+  coolifyProjectWithEnvironmentsSchema,
+  coolifyResourceSchema,
+  coolifyServerSchema,
+  coolifyServiceSchema,
+} from "./coolify-types";
+
+export class CoolifyIntegration extends Integration {
+  protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
+    const healthUrl = this.url("/api/health");
+    const healthResponse = await input.fetchAsync(healthUrl, {});
+
+    if (!healthResponse.ok) {
+      throw new ResponseError(healthResponse);
+    }
+
+    // Test API key authentication
+    const versionUrl = this.url("/api/v1/version");
+    const versionResponse = await input.fetchAsync(versionUrl, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!versionResponse.ok) {
+      throw new ResponseError(versionResponse);
+    }
+
+    return { success: true };
+  }
+
+  /**
+   * Get Coolify version information
+   * https://coolify.io/docs/api-reference/api/operations/version
+   */
+  public async getVersionAsync(): Promise<string> {
+    const url = this.url("/api/v1/version");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    const version = await response.text();
+    return version.trim();
+  }
+
+  /**
+   * Get Coolify healthcheck status
+   * https://coolify.io/docs/api-reference/api/operations/healthcheck
+   */
+  public async getHealthcheckAsync(): Promise<CoolifyHealthcheck> {
+    const url = this.url("/api/v1/healthcheck");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyHealthcheckSchema.parse(await response.json());
+  }
+
+  /**
+   * List all applications
+   * https://coolify.io/docs/api-reference/api/operations/list-applications
+   */
+  public async listApplicationsAsync(): Promise<CoolifyApplication[]> {
+    const url = this.url("/api/v1/applications");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyApplicationSchema.array().parse(await response.json());
+  }
+
+  /**
+   * Get application by UUID
+   * https://coolify.io/docs/api-reference/api/operations/get-application-by-uuid
+   */
+  public async getApplicationByUuidAsync(uuid: string): Promise<CoolifyApplication> {
+    const url = this.url(`/api/v1/applications/${uuid}`);
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyApplicationSchema.parse(await response.json());
+  }
+
+  /**
+   * Get application logs by UUID
+   * https://coolify.io/docs/api-reference/api/operations/get-application-logs-by-uuid
+   */
+  public async getApplicationLogsAsync(uuid: string): Promise<string> {
+    const url = this.url(`/api/v1/applications/${uuid}/logs`);
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    const result = coolifyApplicationLogSchema.parse(await response.json());
+    return result.logs;
+  }
+
+  /**
+   * List environment variables by application UUID
+   * https://coolify.io/docs/api-reference/api/operations/list-envs-by-application-uuid
+   */
+  public async listEnvsByApplicationUuidAsync(uuid: string): Promise<CoolifyEnvironmentVariable[]> {
+    const url = this.url(`/api/v1/applications/${uuid}/envs`);
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyEnvironmentVariableSchema.array().parse(await response.json());
+  }
+
+  /**
+   * List projects
+   * https://coolify.io/docs/api-reference/api/operations/list-projects
+   */
+  public async listProjectsAsync(): Promise<CoolifyProject[]> {
+    const url = this.url("/api/v1/projects");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyProjectSchema.array().parse(await response.json());
+  }
+
+  /**
+   * Get project by UUID (includes environments)
+   * https://coolify.io/docs/api-reference/api/operations/get-project-by-uuid
+   */
+  public async getProjectByUuidAsync(uuid: string): Promise<CoolifyProjectWithEnvironments> {
+    const url = this.url(`/api/v1/projects/${uuid}`);
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyProjectWithEnvironmentsSchema.parse(await response.json());
+  }
+
+  /**
+   * Get environments
+   * https://coolify.io/docs/api-reference/api/operations/get-environments
+   */
+  public async getEnvironmentsAsync(): Promise<CoolifyEnvironment[]> {
+    const url = this.url("/api/v1/environments");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyEnvironmentSchema.array().parse(await response.json());
+  }
+
+  /**
+   * Get environment by name or UUID
+   * https://coolify.io/docs/api-reference/api/operations/get-environment-by-name-or-uuid
+   */
+  public async getEnvironmentByNameOrUuidAsync(nameOrUuid: string): Promise<CoolifyEnvironment> {
+    const url = this.url(`/api/v1/environments/${nameOrUuid}`);
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyEnvironmentSchema.parse(await response.json());
+  }
+
+  /**
+   * List resources
+   * https://coolify.io/docs/api-reference/api/operations/list-resources
+   */
+  public async listResourcesAsync(): Promise<CoolifyResource[]> {
+    const url = this.url("/api/v1/resources");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyResourceSchema.array().parse(await response.json());
+  }
+
+  /**
+   * List servers
+   * https://coolify.io/docs/api-reference/api/operations/list-servers
+   */
+  public async listServersAsync(): Promise<CoolifyServer[]> {
+    const url = this.url("/api/v1/servers");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyServerSchema.array().parse(await response.json());
+  }
+
+  /**
+   * List services
+   * https://coolify.io/docs/api-reference/api/operations/list-services
+   */
+  public async listServicesAsync(): Promise<CoolifyService[]> {
+    const url = this.url("/api/v1/services");
+    const response = await fetchWithTrustedCertificatesAsync(url, {
+      headers: this.getAuthHeaders(),
+    });
+
+    if (!response.ok) {
+      throw new ResponseError(response);
+    }
+
+    return coolifyServiceSchema.array().parse(await response.json());
+  }
+
+  public async getInstanceInfoAsync(): Promise<CoolifyInstanceInfo> {
+    const [version, applications, services, projectsWithEnvs, servers] = await Promise.all([
+      this.getVersionAsync(),
+      this.listApplicationsAsync(),
+      this.listServicesAsync(),
+      this.listProjectsWithEnvironmentsAsync(),
+      this.listServersAsync(),
+    ]);
+
+    const envToProjectMap = new Map<
+      number,
+      { projectName: string; projectUuid: string; environmentName: string; environmentUuid?: string }
+    >();
+    for (const project of projectsWithEnvs) {
+      for (const env of project.environments ?? []) {
+        if (env.id != null) {
+          envToProjectMap.set(env.id, {
+            projectName: project.name,
+            projectUuid: project.uuid,
+            environmentName: env.name,
+            environmentUuid: env.uuid ?? undefined,
+          });
+        }
+      }
+    }
+
+    const applicationsWithContext: CoolifyApplicationWithContext[] = applications.map((app) => {
+      const context = app.environment_id ? envToProjectMap.get(app.environment_id) : undefined;
+      return {
+        ...app,
+        projectName: context?.projectName,
+        projectUuid: context?.projectUuid,
+        environmentName: context?.environmentName,
+        environmentUuid: context?.environmentUuid,
+      };
+    });
+
+    const servicesWithContext: CoolifyServiceWithContext[] = services.map((service) => {
+      const context = service.environment_id ? envToProjectMap.get(service.environment_id) : undefined;
+      const fqdn = service.fqdn ?? service.applications?.find((app) => app.fqdn)?.fqdn ?? undefined;
+      return {
+        ...service,
+        fqdn,
+        projectName: context?.projectName,
+        projectUuid: context?.projectUuid,
+        environmentName: context?.environmentName,
+        environmentUuid: context?.environmentUuid,
+      };
+    });
+
+    return {
+      version,
+      applications: applicationsWithContext,
+      services: servicesWithContext,
+      servers,
+    };
+  }
+
+  /**
+   * List all projects with their environments
+   */
+  private async listProjectsWithEnvironmentsAsync(): Promise<CoolifyProjectWithEnvironments[]> {
+    const projects = await this.listProjectsAsync();
+    const projectsWithEnvs = await Promise.all(projects.map((project) => this.getProjectByUuidAsync(project.uuid)));
+    return projectsWithEnvs;
+  }
+
+  private getAuthHeaders(): Record<string, string> {
+    return {
+      Authorization: `Bearer ${this.getSecretValue("apiKey")}`,
+    };
+  }
+}
@@ -0,0 +1,154 @@
+// Coolify API Types and Schemas based on https://coolify.io/docs/api-reference/api
+import { z } from "zod/v4";
+
+// Health check schema
+export const coolifyHealthcheckSchema = z.object({
+  status: z.string(),
+});
+
+export type CoolifyHealthcheck = z.infer<typeof coolifyHealthcheckSchema>;
+
+// Application log schema
+export const coolifyApplicationLogSchema = z.object({
+  logs: z.string(),
+});
+
+export type CoolifyApplicationLog = z.infer<typeof coolifyApplicationLogSchema>;
+
+// Environment variable schema
+export const coolifyEnvironmentVariableSchema = z.object({
+  id: z.number().nullish(),
+  key: z.string(),
+  value: z.string(),
+  is_build_time: z.boolean().nullish(),
+  is_preview: z.boolean().nullish(),
+  application_id: z.number().nullish(),
+});
+
+export type CoolifyEnvironmentVariable = z.infer<typeof coolifyEnvironmentVariableSchema>;
+
+// Application schema (only fields used in the widget)
+export const coolifyApplicationSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+  status: z.string().nullish(),
+  fqdn: z.string().nullish(),
+  environment_id: z.number().nullish(),
+  server_id: z.number().nullish(),
+  destination_id: z.number().nullish(),
+  updated_at: z.string().nullish(),
+  last_online_at: z.string().nullish(),
+});
+
+export type CoolifyApplication = z.infer<typeof coolifyApplicationSchema>;
+
+// Project schema
+export const coolifyProjectSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+});
+
+export type CoolifyProject = z.infer<typeof coolifyProjectSchema>;
+
+// Environment schema
+export const coolifyEnvironmentSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string().nullish(),
+  name: z.string(),
+  project_id: z.number().nullish(),
+});
+
+export type CoolifyEnvironment = z.infer<typeof coolifyEnvironmentSchema>;
+
+// Project with environments schema
+export const coolifyProjectWithEnvironmentsSchema = coolifyProjectSchema.extend({
+  environments: z.array(coolifyEnvironmentSchema).nullish(),
+});
+
+export type CoolifyProjectWithEnvironments = z.infer<typeof coolifyProjectWithEnvironmentsSchema>;
+
+// Resource schema
+export const coolifyResourceSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+  type: z.string(),
+  status: z.string().nullish(),
+});
+
+export type CoolifyResource = z.infer<typeof coolifyResourceSchema>;
+
+// Server settings schema
+export const coolifyServerSettingsSchema = z.object({
+  server_id: z.number().nullish(),
+  is_build_server: z.boolean().nullish(),
+  is_reachable: z.boolean().nullish(),
+  is_usable: z.boolean().nullish(),
+});
+
+export type CoolifyServerSettings = z.infer<typeof coolifyServerSettingsSchema>;
+
+// Server schema
+export const coolifyServerSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+  ip: z.string().nullish(),
+  is_reachable: z.boolean().nullish(),
+  is_usable: z.boolean().nullish(),
+  settings: coolifyServerSettingsSchema.nullish(),
+});
+
+export type CoolifyServer = z.infer<typeof coolifyServerSchema>;
+
+// Service application schema (nested in services)
+export const coolifyServiceApplicationSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+  fqdn: z.string().nullish(),
+  status: z.string().nullish(),
+});
+
+export type CoolifyServiceApplication = z.infer<typeof coolifyServiceApplicationSchema>;
+
+// Service schema
+export const coolifyServiceSchema = z.object({
+  id: z.number().nullish(),
+  uuid: z.string(),
+  name: z.string(),
+  status: z.string().nullish(),
+  fqdn: z.string().nullish(),
+  environment_id: z.number().nullish(),
+  server_id: z.number().nullish(),
+  destination_id: z.number().nullish(),
+  updated_at: z.string().nullish(),
+  applications: z.array(coolifyServiceApplicationSchema).nullish(),
+});
+
+export type CoolifyService = z.infer<typeof coolifyServiceSchema>;
+
+// Extended types with context (not from API, added by integration)
+export interface CoolifyApplicationWithContext extends CoolifyApplication {
+  projectName?: string;
+  projectUuid?: string;
+  environmentName?: string;
+  environmentUuid?: string;
+}
+
+export interface CoolifyServiceWithContext extends CoolifyService {
+  projectName?: string;
+  projectUuid?: string;
+  environmentName?: string;
+  environmentUuid?: string;
+}
+
+// Aggregated information for the Coolify instance
+export interface CoolifyInstanceInfo {
+  version: string;
+  applications: CoolifyApplicationWithContext[];
+  services: CoolifyServiceWithContext[];
+  servers: CoolifyServer[];
+}
@@ -0,0 +1,313 @@
+import { Request, Response } from "undici";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
+
+import { CoolifyIntegration } from "../coolify-integration";
+import type {
+  CoolifyApplication,
+  CoolifyProject,
+  CoolifyProjectWithEnvironments,
+  CoolifyServer,
+  CoolifyService,
+} from "../coolify-types";
+
+vi.mock("@homarr/core/infrastructure/http", () => ({
+  fetchWithTrustedCertificatesAsync: vi.fn(),
+}));
+
+const TEST_API_KEY = "test-api-key-12345";
+const TEST_URL = "https://coolify.example.com";
+
+type MockResponseData = string | Record<string, unknown> | unknown[];
+
+const mockFetchWithTrustedCertificates = vi.mocked(fetchWithTrustedCertificatesAsync);
+
+const setupMockFetch = (responses: Record<string, MockResponseData>) => {
+  mockFetchWithTrustedCertificates.mockImplementation((url) => {
+    const urlString = typeof url === "string" ? url : url instanceof Request ? url.url : url.toString();
+    const urlObj = new URL(urlString);
+    const path = urlObj.pathname;
+
+    if (path in responses) {
+      const data = responses[path];
+      const body = typeof data === "string" ? data : JSON.stringify(data);
+      return Promise.resolve(
+        new Response(body, {
+          status: 200,
+          headers: { "content-type": "application/json" },
+        }) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
+      );
+    }
+
+    return Promise.resolve(
+      new Response(JSON.stringify({ error: "Not Found" }), {
+        status: 404,
+        headers: { "content-type": "application/json" },
+      }) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
+    );
+  });
+};
+
+const createCoolifyIntegration = () => {
+  return new CoolifyIntegration({
+    id: "test-coolify",
+    name: "Test Coolify",
+    url: TEST_URL,
+    externalUrl: null,
+    decryptedSecrets: [{ kind: "apiKey", value: TEST_API_KEY }],
+  });
+};
+
+describe("CoolifyIntegration", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe("getVersionAsync", () => {
+    test("should return version string from Coolify API", async () => {
+      setupMockFetch({
+        "/api/v1/version": "4.0.0-beta.460",
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.getVersionAsync();
+
+      expect(result).toBe("4.0.0-beta.460");
+      expect(mockFetchWithTrustedCertificates).toHaveBeenCalled();
+    });
+
+    test("should throw error when API returns error", async () => {
+      mockFetchWithTrustedCertificates.mockResolvedValue(
+        new Response("Unauthorized", {
+          status: 401,
+          headers: { "content-type": "text/plain" },
+        }) as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>,
+      );
+
+      const integration = createCoolifyIntegration();
+      await expect(integration.getVersionAsync()).rejects.toThrow();
+    });
+  });
+
+  describe("listServersAsync", () => {
+    test("should return list of servers", async () => {
+      const servers: CoolifyServer[] = [
+        {
+          id: 1,
+          uuid: "server-uuid-1",
+          name: "Production Server",
+          ip: "192.168.1.100",
+          is_reachable: true,
+          is_usable: true,
+          settings: { is_build_server: false },
+        },
+        {
+          id: 2,
+          uuid: "server-uuid-2",
+          name: "Build Server",
+          ip: "192.168.1.101",
+          is_reachable: true,
+          is_usable: true,
+          settings: { is_build_server: true },
+        },
+      ];
+
+      setupMockFetch({
+        "/api/v1/servers": servers,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.listServersAsync();
+
+      expect(result).toHaveLength(2);
+      expect(result[0]?.name).toBe("Production Server");
+      expect(result[1]?.settings?.is_build_server).toBe(true);
+    });
+  });
+
+  describe("listApplicationsAsync", () => {
+    test("should return list of applications", async () => {
+      const applications: CoolifyApplication[] = [
+        {
+          id: 1,
+          uuid: "app-uuid-1",
+          name: "my-app",
+          fqdn: "https://myapp.example.com",
+          status: "running",
+          updated_at: "2024-01-01T00:00:00Z",
+        },
+        {
+          id: 2,
+          uuid: "app-uuid-2",
+          name: "another-app",
+          fqdn: "https://another.example.com",
+          status: "stopped",
+          updated_at: "2024-01-01T00:00:00Z",
+        },
+      ];
+
+      setupMockFetch({
+        "/api/v1/applications": applications,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.listApplicationsAsync();
+
+      expect(result).toHaveLength(2);
+      expect(result[0]?.status).toBe("running");
+      expect(result[1]?.status).toBe("stopped");
+    });
+  });
+
+  describe("listServicesAsync", () => {
+    test("should return list of services", async () => {
+      const services: CoolifyService[] = [
+        {
+          id: 1,
+          uuid: "service-uuid-1",
+          name: "postgresql",
+          updated_at: "2024-01-01T00:00:00Z",
+        },
+      ];
+
+      setupMockFetch({
+        "/api/v1/services": services,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.listServicesAsync();
+
+      expect(result).toHaveLength(1);
+      expect(result[0]?.name).toBe("postgresql");
+    });
+  });
+
+  describe("listProjectsAsync", () => {
+    test("should return list of projects", async () => {
+      const projects: CoolifyProject[] = [
+        {
+          id: 1,
+          uuid: "proj-uuid-1",
+          name: "Production",
+        },
+      ];
+
+      setupMockFetch({
+        "/api/v1/projects": projects,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.listProjectsAsync();
+
+      expect(result).toHaveLength(1);
+      expect(result[0]?.name).toBe("Production");
+    });
+  });
+
+  describe("getInstanceInfoAsync", () => {
+    test("should aggregate all instance data with project context", async () => {
+      const projectWithEnvs: CoolifyProjectWithEnvironments = {
+        id: 1,
+        uuid: "proj-uuid-1",
+        name: "Production",
+        environments: [
+          {
+            id: 1,
+            uuid: "env-uuid-1",
+            name: "production",
+            project_id: 1,
+          },
+        ],
+      };
+
+      setupMockFetch({
+        "/api/v1/version": "4.0.0-beta.460",
+        "/api/v1/applications": [
+          {
+            id: 1,
+            uuid: "app-uuid-1",
+            name: "my-app",
+            status: "running",
+            environment_id: 1,
+            updated_at: "2024-01-01T00:00:00Z",
+          },
+        ],
+        "/api/v1/services": [
+          {
+            id: 1,
+            uuid: "service-uuid-1",
+            name: "postgres",
+            environment_id: 1,
+            updated_at: "2024-01-01T00:00:00Z",
+          },
+        ],
+        "/api/v1/projects": [
+          {
+            id: 1,
+            uuid: "proj-uuid-1",
+            name: "Production",
+          },
+        ],
+        "/api/v1/servers": [
+          {
+            id: 1,
+            uuid: "server-uuid-1",
+            name: "Server 1",
+            ip: "192.168.1.1",
+            is_reachable: true,
+            is_usable: true,
+            settings: { is_build_server: false },
+          },
+        ],
+        "/api/v1/projects/proj-uuid-1": projectWithEnvs,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.getInstanceInfoAsync();
+
+      expect(result.version).toBe("4.0.0-beta.460");
+      expect(result.applications).toHaveLength(1);
+      expect(result.services).toHaveLength(1);
+      expect(result.servers).toHaveLength(1);
+      expect(result.applications[0]?.projectName).toBe("Production");
+      expect(result.applications[0]?.environmentName).toBe("production");
+    });
+  });
+
+  describe("getHealthcheckAsync", () => {
+    test("should return healthcheck status", async () => {
+      setupMockFetch({
+        "/api/v1/healthcheck": { status: "healthy" },
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.getHealthcheckAsync();
+
+      expect(result.status).toBe("healthy");
+    });
+  });
+
+  describe("getApplicationByUuidAsync", () => {
+    test("should return application details by UUID", async () => {
+      const application: CoolifyApplication = {
+        id: 1,
+        uuid: "app-uuid-1",
+        name: "my-app",
+        fqdn: "https://app.example.com",
+        status: "running",
+        updated_at: "2024-01-01T00:00:00Z",
+      };
+
+      setupMockFetch({
+        "/api/v1/applications/app-uuid-1": application,
+      });
+
+      const integration = createCoolifyIntegration();
+      const result = await integration.getApplicationByUuidAsync("app-uuid-1");
+
+      expect(result.uuid).toBe("app-uuid-1");
+      expect(result.name).toBe("my-app");
+    });
+  });
+});
@@ -55,7 +55,7 @@ export class DashDotIntegration extends Integration implements ISystemHealthMoni
      cpuTemp: cpuLoad.averageTemperature,
      availablePkgUpdates: 0,
      rebootRequired: false,
-      smart: [],
+      smart: [], // API endpoint does not provide S.M.A.R.T data.
      uptime: info.uptime,
      version: `${info.operatingSystemVersion}`,
      loadAverage: {
@@ -25,6 +25,7 @@ export { TrueNasIntegration } from "./truenas/truenas-integration";
 export { UnraidIntegration } from "./unraid/unraid-integration";
 export { OPNsenseIntegration } from "./opnsense/opnsense-integration";
 export { ICalIntegration } from "./ical/ical-integration";
+export { CoolifyIntegration } from "./coolify/coolify-integration";

 // Types
 export type { IntegrationInput } from "./base/integration";
@@ -29,6 +29,7 @@ export interface SystemHealthMonitoring {
    deviceName: string;
    temperature: number | null;
    overallStatus: string;
+    healthy: boolean;
  }[];
 }

@@ -33,6 +33,7 @@ export class SystemHealthMonitoringMockService implements ISystemHealthMonitorin
          deviceName: "Mock Device",
          temperature: Math.floor(Math.random() * 100), // Random temperature between 0 and 99
          overallStatus: "OK",
+          healthy: true,
        },
      ],
    });
@@ -62,6 +62,8 @@ export class OpenMediaVaultIntegration extends Integration implements ISystemHea
    const smart = smartResult.data.response.map((smart) => ({
      deviceName: smart.devicename,
      temperature: smart.temperature,
+      // https://github.com/openmediavault/openmediavault/blob/2eb871d05cec6ff49603134d3acead561da01e4d/deb/openmediavault/usr/share/php/openmediavault/system/storage/smartinformation.inc#L592-L605
+      healthy: smart.overallstatus === "GOOD",
      overallStatus: smart.overallstatus,
    }));

@@ -115,9 +115,8 @@ export class OverseerrIntegration
  }

  public async getRequestsAsync(): Promise<MediaRequest[]> {
-    //Ensure to get all pending request first
    const pendingRequests = await fetchWithTrustedCertificatesAsync(
-      this.url("/api/v1/request", { take: -1, filter: "pending" }),
+      this.url("/api/v1/request", { take: 20, filter: "pending" }),
      {
        headers: {
          "X-Api-Key": this.getSecretValue("apiKey"),
@@ -125,7 +124,6 @@ export class OverseerrIntegration
      },
    );

-    //Change 20 to integration setting (set to -1 for all)
    const allRequests = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/request", { take: 20 }), {
      headers: {
        "X-Api-Key": this.getSecretValue("apiKey"),
@@ -223,7 +221,7 @@ export class OverseerrIntegration
  }

  public async getUsersAsync(): Promise<RequestUser[]> {
-    const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/user", { take: -1 }), {
+    const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/user", { take: 10, sort: "requests" }), {
      headers: {
        "X-Api-Key": this.getSecretValue("apiKey"),
      },
@@ -112,6 +112,27 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
    });
  }

+  private async getPoolsAsync() {
+    logger.debug("Retrieving pools", {
+      url: this.wsUrl(),
+    });
+
+    const response = await this.requestAsync("pool.query", [
+      [],
+      {
+        extra: {
+          is_upgraded: true,
+        },
+      },
+    ]);
+    const result = await poolSchema.parseAsync(response);
+    logger.debug("Retrieved pools", {
+      url: this.wsUrl(),
+      count: result.length,
+    });
+    return result;
+  }
+
  /**
   * Retrieves data using the reporting method
   * @see https://www.truenas.com/docs/api/scale_websocket_api.html#reporting
@@ -225,6 +246,7 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
    const cpuData = this.extractLatestReportingData(reporting, "cpu");
    const cpuTempData = this.extractLatestReportingData(reporting, "cputemp");
    const memoryData = this.extractLatestReportingData(reporting, "memory");
+    const datasets = await this.getPoolsAsync();

    const netdata = await this.getReportingNetdataAsync();

@@ -236,14 +258,24 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
      cpuTemp: Math.max(...cpuTempData.filter((_item, i) => i > 0)),
      memAvailableInBytes: systemInformation.physmem,
      memUsedInBytes: memoryData[1] ?? 0, // Index 0 is UNIX timestamp, Index 1 is free space in bytes
-      fileSystem: [],
+      fileSystem: datasets.map((dataset) => ({
+        deviceName: dataset.name,
+        available: `${dataset.size}`, // TODO: can we use number instead of string here?
+        used: `${dataset.allocated}`,
+        percentage: (dataset.allocated / dataset.size) * 100,
+      })),
      availablePkgUpdates: 0,
      network: {
        up: upload * NETWORK_MULTIPLIER,
        down: download * NETWORK_MULTIPLIER,
      },
      loadAverage: null,
-      smart: [],
+      smart: datasets.map((dataset) => ({
+        deviceName: dataset.name,
+        healthy: dataset.healthy,
+        overallStatus: dataset.status,
+        temperature: null,
+      })),
      uptime: systemInformation.uptime_seconds,
      version: systemInformation.version,
      cpuModelName: systemInformation.model,
@@ -351,6 +383,17 @@ const reportingItemSchema = z.object({

 type ReportingItem = z.infer<typeof reportingItemSchema>;

+const poolSchema = z.array(
+  z.object({
+    name: z.string(),
+    status: z.string(),
+    healthy: z.boolean(),
+    free: z.number().min(0),
+    size: z.number(),
+    allocated: z.number(),
+  }),
+);
+
 const reportingNetDataSchema = z.array(
  z.object({
    name: z.string(),
@@ -11,3 +11,4 @@ export * from "./proxmox/proxmox-types";
 export * from "./unifi-controller/unifi-controller-types";
 export * from "./opnsense/opnsense-types";
 export * from "./interfaces/media-releases";
+export * from "./coolify/coolify-types";
@@ -67,6 +67,8 @@ export class UnraidIntegration extends Integration implements ISystemHealthMonit
        deviceName: disk.name,
        temperature: disk.temp ?? null,
        overallStatus: disk.status,
+        // See ArrayDiskStatus from https://studio.apollographql.com/public/Unraid-API/variant/current/explorer
+        healthy: disk.status === "DISK_OK",
      })),
    };
  }
@@ -2,7 +2,7 @@ import type { StartedTestContainer } from "testcontainers";
 import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
 import { beforeAll, describe, expect, test, vi } from "vitest";

-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { Aria2Integration } from "../src";

@@ -11,7 +11,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });
 vi.mock("@homarr/core/infrastructure/certificates", async (importActual) => {
@@ -1,7 +1,7 @@
 import { describe, expect, test, vi } from "vitest";

 import { ResponseError } from "@homarr/common/server";
-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import type { IntegrationTestingInput } from "../src/base/integration";
 import { Integration } from "../src/base/integration";
@@ -12,7 +12,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });

@@ -3,7 +3,7 @@ import type { StartedTestContainer } from "testcontainers";
 import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
 import { beforeAll, describe, expect, test, vi } from "vitest";

-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { HomeAssistantIntegration } from "../src";
 import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -13,7 +13,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });

@@ -4,7 +4,7 @@ import type { StartedTestContainer } from "testcontainers";
 import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
 import { beforeAll, describe, expect, test, vi } from "vitest";

-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { NzbGetIntegration } from "../src";
 import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -14,7 +14,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });

@@ -2,7 +2,7 @@ import type { StartedTestContainer } from "testcontainers";
 import { GenericContainer, Wait } from "testcontainers";
 import { describe, expect, test, vi } from "vitest";

-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { PiHoleIntegrationV5, PiHoleIntegrationV6 } from "../src";
 import type { SessionStore } from "../src/base/session-store";
@@ -13,7 +13,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });

@@ -3,7 +3,7 @@ import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "te
 import type { StartedTestContainer } from "testcontainers";
 import { beforeAll, describe, expect, test, vi } from "vitest";

-import { createDbAsync } from "@homarr/db/test";
+import { createDb } from "@homarr/db/test";

 import { SabnzbdIntegration } from "../src";
 import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -14,7 +14,7 @@ vi.mock("@homarr/db", async (importActual) => {
  const actual = await importActual<typeof import("@homarr/db")>();
  return {
    ...actual,
-    db: await createDbAsync(),
+    db: createDb(),
  };
 });

@@ -33,12 +33,12 @@
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/ui": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "@mantine/core": "^8.3.12",
+    "@mantine/core": "^8.3.14",
    "@tabler/icons-react": "^3.36.1",
    "dayjs": "^1.11.19",
-    "next": "16.1.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "next": "16.1.6",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
    "zod": "^4.2.1"
  },
  "devDependencies": {
@@ -1 +1 @@
 .12.0
 .13.0