diff --git a/.github/workflows/pmm2-testsuite.yml b/.github/workflows/pmm2-testsuite.yml
index fe695e0d85a8..217b8be666f6 100644
--- a/.github/workflows/pmm2-testsuite.yml
+++ b/.github/workflows/pmm2-testsuite.yml
@@ -1,4 +1,4 @@
-name: pmm2 integration tests pipeline
+name: PMM2 Integration Tests
 on:
   # run with default inputs
   workflow_dispatch:
@@ -71,12 +71,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        db-type: [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove]
+        db-type: [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, server-container, clientContainer, haproxy, proxysql, remove]
 
     steps:
       - name: Create status check
         if: ${{ env.SHA != 'null' }}
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -101,15 +101,13 @@ jobs:
           repository: percona/pmm-ui-tests
           path: ./pmm-ui-tests
 
-      - name: Install  playwright
+      - name: Install playwright
         working-directory: ./pmm-ui-tests/cli
         run: |
-          npm install
-          npx playwright install
+          npm ci
 
       - name: Setup tools
         run: |
-          npm install -g bats
           sudo apt-get install -y apt-transport-https ca-certificates dirmngr ansible libaio1 libaio-dev libnuma-dev libncurses5 socat sysbench
           sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
           echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
@@ -123,12 +121,12 @@ jobs:
       - name: Setup PMM2-Server
         run: |
           docker create -v /srv --name pmm-server-data ${{ env.SERVER_IMAGE }}
-          docker run -d -p 80:80 -p 443:443 -p 9000:9000 -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.SERVER_IMAGE }}
-          sleep 30
+          docker run -d -p 80:80 -p 443:443 -p 9000:9000 \
+            -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 \
+            -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX \
+            --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.SERVER_IMAGE }}
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://127.0.0.1/v1/readyz)" != "200" ]]; do sleep 2; done' || false
 
-      - name: healthcheck PMM2-server
-        run: timeout 100 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost/ping)" != "200" ]]; do sleep 5; done' || false
-      
       - name: Setup PMM2-Client
         run: sudo -E bash -x ./pmm-tests/pmm2-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.CLIENT_VERSION }} --admin_password admin --use_metrics_mode no
 
@@ -139,12 +137,12 @@ jobs:
       - name: Run CLI '--help' tests
         if: ${{ matrix.db-type == 'help' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/help.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/help.spec.ts --quiet
 
       - name: Run CLI remove tests
         if: ${{ matrix.db-type == 'remove' }}
-        working-directory: ./pmm-ui-tests
-        run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts
+        working-directory: ./pmm-ui-tests/cli
+        run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts --quiet
 
       - name: Run Setup for ps5.7
         working-directory: pmm-integration
@@ -158,10 +156,10 @@ jobs:
         run: |
           sudo npx ts-node ./integration-setup.ts --ps-version=8 --ci --addclient=ps,1
 
-      - name: Run bats tests for PS
+      - name: Run CLI tests for PS
         if: ${{ matrix.db-type == 'ps5.7' || matrix.db-type == 'ps8' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts --quiet
 
       - name: Run Setup for pdpgsql 13
         working-directory: pmm-integration
@@ -184,7 +182,7 @@ jobs:
       - name: Run CLI tests for PDPGSQL
         if: ${{ matrix.db-type == 'pdpgsql13' || matrix.db-type == 'pdpgsql14' || matrix.db-type == 'pdpgsql15' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test postgreSql
+        run: npx playwright test postgreSql --quiet
 
       - name: Run Setup for PSMDB 4.4
         working-directory: pmm-integration
@@ -204,7 +202,7 @@ jobs:
       - name: Run CLI tests for PSMDB
         if: ${{ matrix.db-type == 'modb6' || matrix.db-type == 'modb5' || matrix.db-type == 'modb4.4' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts --quiet
 
 # TODO: Add setup for the official MongoDB and run "npx playwright test pmm-ui-tests/cli/tests/mongoDb.spec.ts"
 
@@ -216,17 +214,17 @@ jobs:
       - name: Run CLI tests for Generic Scenarios
         if: ${{ matrix.db-type == 'generic' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test generic unregister
+        run: npx playwright test generic unregister --quiet
 
-      - name: Run bats tests for generic Scenarios
-        if: ${{ matrix.db-type == 'generic' }}
-        run: |
-          sudo bats ./pmm-tests/pmm-2-0-bats-tests/generic-tests.bats
+      - name: Run CLI tests for PMM Server Container
+        if: ${{ matrix.db-type == 'server-container' && !contains(env.PMM_UI_BRANCH, 'pmm-2.') }}
+        working-directory: ./pmm-ui-tests/cli
+        run: npx playwright test pmm-server-only --quiet
 
       - name: Run CLI tests for PMM Client Docker Container
         if: ${{ matrix.db-type == 'clientContainer' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-client-docker
+        run: npx playwright test pmm-client-docker --quiet
 
       - name: Run Setup for HAPROXY
         if: ${{ matrix.db-type == 'haproxy' }}
@@ -238,7 +236,7 @@ jobs:
       - name: Run CLI tests for Client Container Scenarios
         if: ${{ matrix.db-type == 'haproxy' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test haproxy
+        run: npx playwright test haproxy --quiet
 
       - name: Run Setup for ProxySQL
         if: ${{ matrix.db-type == 'proxysql' }}
@@ -247,7 +245,7 @@ jobs:
       - name: Run CLI tests for ProxySQL
         if: ${{ matrix.db-type == 'proxysql' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test proxySql
+        run: npx playwright test proxySql --quiet
 
       - name: Run Setup for MySQL 8.0
         if: ${{ matrix.db-type == 'ms8.0' }}
@@ -256,23 +254,23 @@ jobs:
       - name: Run MySQL specific CLI tests
         if: ${{ matrix.db-type == 'ms8.0' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mysql.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mysql.spec.ts --quiet
 
       - name: Run CLI tests for MySQL Tests
         if: ${{ matrix.db-type == 'ms8.0' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts --quiet
 
       - name: Generate and Attach the report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "report-${{ matrix.db-type }}"
           path: ./pmm-ui-tests/cli/test-report
 
       - name: Create status check
         if: ${{ always() }}
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/trivy_scan.yml b/.github/workflows/trivy_scan.yml
index 6496ad34ff87..13614f5f1580 100644
--- a/.github/workflows/trivy_scan.yml
+++ b/.github/workflows/trivy_scan.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SHA: ${{ github.event.inputs.sha || github.event.pull_request.head.sha || github.sha }}
-    
+
     strategy:
       fail-fast: false
       matrix:
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Communicate action status back to the PR
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -59,7 +59,7 @@ jobs:
 
       - name: Archive trivy scan results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.REPORT }}
           path: ${{ env.REPORT }}
@@ -67,7 +67,7 @@ jobs:
 
       - name: Communicate action status back to the PR
         if: always()
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ui-tests-podman.yml b/.github/workflows/ui-tests-podman.yml
index d43434edf250..4799dd9bed93 100644
--- a/.github/workflows/ui-tests-podman.yml
+++ b/.github/workflows/ui-tests-podman.yml
@@ -67,7 +67,7 @@ jobs:
     steps:
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -213,7 +213,7 @@ jobs:
           sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js
           ./node_modules/.bin/codeceptjs run -c pr.codecept.js --grep "${{ env.TAGS_FOR_TESTS }}"
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ always() }}
         id: artifact_name
         with:
@@ -223,7 +223,7 @@ jobs:
 
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' && always() }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 816914612a89..7a3aa7afb9c7 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -64,7 +64,7 @@ jobs:
     steps:
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -136,7 +136,7 @@ jobs:
           sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js
           ./node_modules/.bin/codeceptjs run -c pr.codecept.js --grep "${{ env.TAGS_FOR_TESTS }}"
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ always() }}
         id: artifact_name
         with:
@@ -146,7 +146,7 @@ jobs:
 
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' && always() }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitmodules b/.gitmodules
index 1c873b83ed81..05c3ac270188 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,7 +16,7 @@
 [submodule "mongodb_exporter"]
 	path = sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
 	url = https://github.com/percona/mongodb_exporter.git
-	branch = release-0.39.0
+	branch = release-0.40.0
 [submodule "postgres_exporter"]
 	path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
 	url = https://github.com/percona/postgres_exporter
@@ -40,7 +40,7 @@
 [submodule "percona-toolkit"]
 	path = sources/percona-toolkit/src/github.com/percona/percona-toolkit
 	url = https://github.com/percona/percona-toolkit.git
-	branch = release-v3.5.2
+	branch = release-v3.5.5
 
 # PMM Server
 
diff --git a/VERSION b/VERSION
index 770060be9f9b..d685d64e6ae5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.40.0
+2.41.1
diff --git a/ci-default.yml b/ci-default.yml
index d4269f1b1b11..ededdc232a9f 100644
--- a/ci-default.yml
+++ b/ci-default.yml
@@ -20,7 +20,7 @@ deps:
     component: client
 
   - name: mongodb_exporter
-    branch: release-0.39.0
+    branch: release-0.40.0
     path: sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
     url: https://github.com/percona/mongodb_exporter
     component: client
@@ -56,7 +56,7 @@ deps:
     component: client
 
   - name: percona-toolkit
-    branch: release-v3.5.2
+    branch: release-v3.5.5
     path: sources/percona-toolkit/src/github.com/percona/percona-toolkit
     url: https://github.com/percona/percona-toolkit
     component: client
diff --git a/ci.yml b/ci.yml
index e69de29bb2d1..a0ca33d10963 100644
--- a/ci.yml
+++ b/ci.yml
@@ -0,0 +1,4 @@
+deps:
+- name: grafana
+  branch: PMM-12545-dbaas-removal-ui
+  url: https://github.com/percona/grafana
diff --git a/requirements.txt b/requirements.txt
index ec89fcb8f2aa..6a4ca69949d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 pyaml==23.9.5
-GitPython==3.1.36
+GitPython==3.1.40
 PyGithub==1.59.1
\ No newline at end of file
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
index 51472b9ad2a7..3c6483ac9948 160000
--- a/sources/grafana-dashboards
+++ b/sources/grafana-dashboards
@@ -1 +1 @@
-Subproject commit 51472b9ad2a74ce4c3dd211599f26dadc27ec170
+Subproject commit 3c6483ac9948b419bccdb422e7eae4d301c68250
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
index 4a59c2392bda..c7a42523b0d2 160000
--- a/sources/grafana/src/github.com/grafana/grafana
+++ b/sources/grafana/src/github.com/grafana/grafana
@@ -1 +1 @@
-Subproject commit 4a59c2392bda679035bedc0a6118e42ceb20fc08
+Subproject commit c7a42523b0d28a493f99b7b0609b249d355122ae
diff --git a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
index 430098a28613..cb3db8922fb0 160000
--- a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
+++ b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
@@ -1 +1 @@
-Subproject commit 430098a28613273e386563a84c57b9e84dc1a298
+Subproject commit cb3db8922fb068bba6ecd4c12c231cb63d970515
diff --git a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter
index bdc2cb510fa9..e1c3dff7c498 160000
--- a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter
+++ b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter
@@ -1 +1 @@
-Subproject commit bdc2cb510fa9834a9b95aa9616ca3699b41e5fb9
+Subproject commit e1c3dff7c4989b9ed712555178749fcb0f255f0e
diff --git a/sources/percona-toolkit/src/github.com/percona/percona-toolkit b/sources/percona-toolkit/src/github.com/percona/percona-toolkit
index c1ba474a8496..a4f1f4d6bd55 160000
--- a/sources/percona-toolkit/src/github.com/percona/percona-toolkit
+++ b/sources/percona-toolkit/src/github.com/percona/percona-toolkit
@@ -1 +1 @@
-Subproject commit c1ba474a84963f3fb58608849fdcba4f96c2d872
+Subproject commit a4f1f4d6bd552f6b00694b6d697cf2aece163073
diff --git a/sources/pmm-dump b/sources/pmm-dump
index 894898307aa1..0d49b2772950 160000
--- a/sources/pmm-dump
+++ b/sources/pmm-dump
@@ -1 +1 @@
-Subproject commit 894898307aa1c2f5fa24bca50d610eef47c143a8
+Subproject commit 0d49b27729506dc62950f9fa59147d63df194db2
diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa
index 8bb4a76d387d..dc631fb5b4e1 160000
--- a/sources/pmm-qa/src/github.com/percona/pmm-qa
+++ b/sources/pmm-qa/src/github.com/percona/pmm-qa
@@ -1 +1 @@
-Subproject commit 8bb4a76d387d0f74828e13ab6eccb3df02d486b0
+Subproject commit dc631fb5b4e1a6a722cc8d8d1f2b0ec02309745f
diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
index ae57c1814eb4..7823a97376ae 160000
--- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
+++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
@@ -1 +1 @@
-Subproject commit ae57c1814eb4828eace0fbebfb9a991abeaafa1b
+Subproject commit 7823a97376ae118e3238da5739a82f99ae398064
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
index bbb794fa2bc5..6153c20e4bf4 160000
--- a/sources/pmm/src/github.com/percona/pmm
+++ b/sources/pmm/src/github.com/percona/pmm
@@ -1 +1 @@
-Subproject commit bbb794fa2bc57a346e08b14a7140979eddb325e7
+Subproject commit 6153c20e4bf4d075ab4a06f871c39ae46337a2ed
diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter
index 64023a684fbc..d44c3d5f6173 160000
--- a/sources/postgres_exporter/src/github.com/percona/postgres_exporter
+++ b/sources/postgres_exporter/src/github.com/percona/postgres_exporter
@@ -1 +1 @@
-Subproject commit 64023a684fbcba3e8bd7f968d992929a926fe79c
+Subproject commit d44c3d5f61730eb88ae07174d3a6ebeffec68d0e
diff --git a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
index 52769efd5b06..f1c6d315e511 160000
--- a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
+++ b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
@@ -1 +1 @@
-Subproject commit 52769efd5b0615b0beaae760524119e55af1b518
+Subproject commit f1c6d315e511a1a69169aa758d063e5890ebad5d