diff --git a/.gitmodules b/.gitmodules
index d9ce0c3cd42c..0265c6a164f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -47,11 +47,11 @@
 [submodule "pmm-manage"]
 	path = sources/pmm-manage/src/github.com/percona/pmm-manage
 	url = https://github.com/percona/pmm-manage
-	branch = master
+	branch = PMM-3605-do-not-write-config
 [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-3605-manage-yml
 [submodule "qan-api2"]
 	path = sources/qan-api2/src/github.com/Percona-Lab/qan-api
 	url = https://github.com/Percona-Lab/qan-api
@@ -63,15 +63,15 @@
 [submodule "pmm-update"]
 	path = sources/pmm-update
 	url = https://github.com/percona/pmm-update
-	branch = PMM-2.0
+	branch = PMM-3605-do-not-backup-password
 [submodule "pmm-server"]
 	path = sources/pmm-server
 	url = https://github.com/percona/pmm-server
-	branch = PMM-2.0
+	branch = PMM-3605-manage-yml
 [submodule "pmm-server-packaging"]
 	path = sources/pmm-server-packaging
 	url = https://github.com/percona/pmm-server-packaging
-	branch = PMM-2.0 
+	branch = PMM-3605-no-helpers
 [submodule "grafana-dashboards"]
 	path = sources/grafana-dashboards
 	url = https://github.com/percona/grafana-dashboards
diff --git a/sources/pmm-manage/src/github.com/percona/pmm-manage b/sources/pmm-manage/src/github.com/percona/pmm-manage
index 9251bed93305..8c5fa776acb4 160000
--- a/sources/pmm-manage/src/github.com/percona/pmm-manage
+++ b/sources/pmm-manage/src/github.com/percona/pmm-manage
@@ -1 +1 @@
-Subproject commit 9251bed93305dc04ca98ab29defbaf933509f601
+Subproject commit 8c5fa776acb4f8fa2313cbe4e16025b0741bb59d
diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
index a1d41923f3a7..91cbe9a36a96 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 a1d41923f3a73a85efccf949c683e35b676c6f04
+Subproject commit 91cbe9a36a964494c3d105dbdc4db665dbf6ad3a
diff --git a/sources/pmm-server b/sources/pmm-server
index 3ef4913f9a0f..dcbea8aa82de 160000
--- a/sources/pmm-server
+++ b/sources/pmm-server
@@ -1 +1 @@
-Subproject commit 3ef4913f9a0f605f179d6f99cdb6bd099cd1e872
+Subproject commit dcbea8aa82de24c44378282b6eaf08e475828336
diff --git a/sources/pmm-server-packaging b/sources/pmm-server-packaging
index ccfb86fc6527..9cfe8bdadbf7 160000
--- a/sources/pmm-server-packaging
+++ b/sources/pmm-server-packaging
@@ -1 +1 @@
-Subproject commit ccfb86fc6527f5e39ac9f23e98152b1e61786b6b
+Subproject commit 9cfe8bdadbf74124089dc64e927655deeaabb0fc
diff --git a/sources/pmm-update b/sources/pmm-update
index 6abe53daa99f..47649509b4fd 160000
--- a/sources/pmm-update
+++ b/sources/pmm-update
@@ -1 +1 @@
-Subproject commit 6abe53daa99f6c75401b4c11928b36d866590226
+Subproject commit 47649509b4fd7c2eedc5e476d43a76a146ee3a66
diff --git a/sources/qan-api2/src/github.com/Percona-Lab/qan-api b/sources/qan-api2/src/github.com/Percona-Lab/qan-api
index 2d974ac7bf8a..e5b720159040 160000
--- a/sources/qan-api2/src/github.com/Percona-Lab/qan-api
+++ b/sources/qan-api2/src/github.com/Percona-Lab/qan-api
@@ -1 +1 @@
-Subproject commit 2d974ac7bf8a8360bc08f1bb31580de5d4c73fc8
+Subproject commit e5b720159040d9140397dc7f363cd6c0a2e58c3d