diff --git a/.gitmodules b/.gitmodules
index 09e3d3dbd8fd..154ca69f56eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "pmm"]
 	path = sources/pmm/src/github.com/percona/pmm
 	url = https://github.com/percona/pmm
-	branch = PMM-2.0
+	branch = PMM-8043-return-service-name
 
 
 # PMM Client
@@ -57,7 +57,7 @@
 [submodule "pmm-managed"]
 	path = sources/pmm-managed/src/github.com/percona/pmm-managed
 	url = https://github.com/percona/pmm-managed
-	branch = PMM-2.0
+	branch = PMM-8043-return-service-name
 [submodule "dbaas-controller"]
 	path = sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
 	url = https://github.com/percona-platform/dbaas-controller
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
index 1122e37810c0..6da528754d30 160000
--- a/sources/grafana-dashboards
+++ b/sources/grafana-dashboards
@@ -1 +1 @@
-Subproject commit 1122e37810c0f9cce3b61aba456d70a8bb53a26d
+Subproject commit 6da528754d30749de8fc790f4388d653bad68116
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
index 6e3be3f72351..f0cda46f46b5 160000
--- a/sources/grafana/src/github.com/grafana/grafana
+++ b/sources/grafana/src/github.com/grafana/grafana
@@ -1 +1 @@
-Subproject commit 6e3be3f72351e4665dc6a1c919acaf456bfd30dd
+Subproject commit f0cda46f46b5aaceb0ed11fa35d668db7aa69c5a
diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin
index 196449ecb2ff..33d4f4a11ec6 160000
--- a/sources/pmm-admin/src/github.com/percona/pmm-admin
+++ b/sources/pmm-admin/src/github.com/percona/pmm-admin
@@ -1 +1 @@
-Subproject commit 196449ecb2ff4c4bdefaebec9e61e3ebcdca368d
+Subproject commit 33d4f4a11ec6c46204d58e6ff6e08ad5742c8ae2
diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent
index dc1d2dc4399b..d3a25eda69c6 160000
--- a/sources/pmm-agent/src/github.com/percona/pmm-agent
+++ b/sources/pmm-agent/src/github.com/percona/pmm-agent
@@ -1 +1 @@
-Subproject commit dc1d2dc4399bbb168cc801cb92f45ccc55b64d8b
+Subproject commit d3a25eda69c617eb8ff7c3062592f0ef44a2254d
diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
index 280366b5570e..936cc84a2a1e 160000
--- a/sources/pmm-managed/src/github.com/percona/pmm-managed
+++ b/sources/pmm-managed/src/github.com/percona/pmm-managed
@@ -1 +1 @@
-Subproject commit 280366b5570e2752fc91d7d05ab0b70f5dfa4343
+Subproject commit 936cc84a2a1e2be4c83746ce74f31eb1b8a17649
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 80387b1210a2..8473bb34e1f5 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 80387b1210a28f473773d42343416ccbca9b0ce3
+Subproject commit 8473bb34e1f56553d7f0bee1de946b17020a80fa
diff --git a/sources/pmm-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update
index 7bfa4ae38ac8..15e211a9dba7 160000
--- a/sources/pmm-update/src/github.com/percona/pmm-update
+++ b/sources/pmm-update/src/github.com/percona/pmm-update
@@ -1 +1 @@
-Subproject commit 7bfa4ae38ac85310638c9d373c8e1a35c0715283
+Subproject commit 15e211a9dba7ec3bd02124366602e3e12a55a96f
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
index 5a2c2509b52d..fa9eed7bd071 160000
--- a/sources/pmm/src/github.com/percona/pmm
+++ b/sources/pmm/src/github.com/percona/pmm
@@ -1 +1 @@
-Subproject commit 5a2c2509b52defb8c7bee9aa1a4294d6f92990c7
+Subproject commit fa9eed7bd071e42a4296e55cb2a2a1d41c4a8839
diff --git a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
index 3a47624f8ce3..2e0ce248ae8c 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 3a47624f8ce349ebd2943a6b2cd2276e3c1ee8e9
+Subproject commit 2e0ce248ae8c9330532842c89488950f3ecc1068
diff --git a/sources/qan-api2/src/github.com/percona/qan-api2 b/sources/qan-api2/src/github.com/percona/qan-api2
index 67950b46821c..1ba1b0f700f8 160000
--- a/sources/qan-api2/src/github.com/percona/qan-api2
+++ b/sources/qan-api2/src/github.com/percona/qan-api2
@@ -1 +1 @@
-Subproject commit 67950b46821cd9c372b895ba0d1740d5579a48fd
+Subproject commit 1ba1b0f700f88f1c81f3068609badfca93dd9e2f