diff --git a/.gitignore b/.gitignore
index c9020999deb7..65175e055dea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ tmp/
 results/
 .DS_Store
 .git-sources
-.vscode
+.vscode/
+.idea/
diff --git a/.gitmodules b/.gitmodules
index 8c44cf195744..abb960c5d704 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,14 +6,6 @@
 
 # PMM Client
 
-[submodule "pmm-admin"]
-	path = sources/pmm-admin/src/github.com/percona/pmm-admin
-	url = https://github.com/percona/pmm-admin.git
-	branch = main
-[submodule "pmm-agent"]
-	path = sources/pmm-agent/src/github.com/percona/pmm-agent
-	url = https://github.com/percona/pmm-agent.git
-	branch = main
 [submodule "node_exporter"]
 	path = sources/node_exporter/src/github.com/prometheus/node_exporter
 	url = https://github.com/percona/node_exporter.git
diff --git a/build/bin/build-client-binary b/build/bin/build-client-binary
index bc8b10d43413..1b04e4293e20 100755
--- a/build/bin/build-client-binary
+++ b/build/bin/build-client-binary
@@ -14,9 +14,10 @@ extract_source_tarball() {
 
 gobuild_component() {
     local component=$1
-    local extract_path=${2:-"github.com/percona/$component"}
-    local component_path=$3
-    local result_file=${4:-bin/$(basename ${component_path:-$extract_path})}
+    local parent_component=${2:-$component}
+    local extract_path=${3:-"github.com/percona/$parent_component"}
+    local component_path=$4
+    local result_file=${5:-bin/$(basename ${component_path:-$extract_path})}
 
     if [ ${component} = 'azure_metrics_exporter' ]; then
         result_file=${result_file/_metrics/}
@@ -50,9 +51,9 @@ gobuild_component() {
         # for 'make release'
         export PMM_RELEASE_VERSION=${full_pmm_version}
         export PMM_RELEASE_TIMESTAMP=$(date '+%s')
-        export PMM_RELEASE_FULLCOMMIT=$(cd sources/${component}/src/${extract_path} && git rev-parse HEAD)
-        export COMPONENT_VERSION=$(cd sources/${component}/src/${extract_path} && git describe --abbrev=0 --always)
-        export COMPONENT_BRANCH=$(cd sources/${component}/src/${extract_path} && git describe --always --contains --all)
+        export PMM_RELEASE_FULLCOMMIT=$(cd sources/${parent_component}/src/${extract_path} && git rev-parse HEAD)
+        export COMPONENT_VERSION=$(cd sources/${parent_component}/src/${extract_path} && git describe --abbrev=0 --always)
+        export COMPONENT_BRANCH=$(cd sources/${parent_component}/src/${extract_path} && git describe --always --contains --all)
         export PMM_RELEASE_BRANCH=""
         sudo chown -R builder:builder /home/builder/tmp
 
@@ -63,7 +64,8 @@ gobuild_component() {
         mkdir -p \$binary_dir/bin
 
         mkdir -p /tmp/go/src/${extract_path}
-        tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/${component}-*.tar.gz
+        archive=$(ls ${source_dir} | grep -e "${parent_component}-\w*\.tar\.gz")
+        tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/\$archive
         pushd /tmp/go
             export GOPATH=\$(pwd -P)
             ${build_command}
@@ -92,18 +94,18 @@ copy_component() {
 main() {
     extract_source_tarball
 
-    gobuild_component "vmagent" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent"
-    gobuild_component "node_exporter"     "github.com/prometheus/node_exporter"
+    gobuild_component "vmagent" "" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent"
+    gobuild_component "node_exporter" "" "github.com/prometheus/node_exporter"
     gobuild_component "mysqld_exporter"
-    gobuild_component "postgres_exporter" "" "cmd/postgres_exporter"
+    gobuild_component "postgres_exporter" "" "" "cmd/postgres_exporter"
     gobuild_component "mongodb_exporter"
     gobuild_component "proxysql_exporter"
     gobuild_component "rds_exporter"
     gobuild_component "azure_metrics_exporter"
-    gobuild_component "clickhouse_exporter"     "github.com/Percona-Lab/clickhouse_exporter"
+    gobuild_component "clickhouse_exporter" "" "github.com/Percona-Lab/clickhouse_exporter"
 
-    gobuild_component "pmm-admin" "" "" "github.com/percona/pmm-agent/bin/pmm-admin"
-    gobuild_component "pmm-agent" "" "" "github.com/percona/pmm-agent/bin/pmm-agent"
+    gobuild_component "pmm-admin" "pmm" "" "" "github.com/percona/pmm/bin/pmm-admin"
+    gobuild_component "pmm-agent" "pmm" "" "" "github.com/percona/pmm/bin/pmm-agent"
 
     echo ${version} > ${binary_dir}/VERSION
 
@@ -120,8 +122,8 @@ main() {
 
     copy_component "percona-toolkit" "bin/pt-summary"
     copy_component "percona-toolkit" "bin/pt-mysql-summary"
-    gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary"
-    gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary"
+    gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary"
+    gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary"
 
     rm -rf ${binary_tarball}
     mkdir -p $(dirname ${binary_tarball}) || :
diff --git a/build/bin/build-client-source b/build/bin/build-client-source
index cbc62845db91..ca1e918d2c2a 100755
--- a/build/bin/build-client-source
+++ b/build/bin/build-client-source
@@ -68,8 +68,7 @@ main() {
 
     prepare_vmagent_tarball
     prepare_tarball pmm-submodules
-    prepare_tarball pmm-admin
-    prepare_tarball pmm-agent
+    prepare_tarball pmm
     prepare_tarball mongodb_exporter
     prepare_tarball mysqld_exporter
     prepare_tarball postgres_exporter
diff --git a/build/bin/create-tags.py b/build/bin/create-tags.py
index 51bf6287b2f7..cd08d21d8e82 100755
--- a/build/bin/create-tags.py
+++ b/build/bin/create-tags.py
@@ -6,8 +6,6 @@
 REPOS = [
     "sources/grafana/src/github.com/grafana/grafana",
     "sources/grafana-dashboards",
-    "sources/pmm-admin/src/github.com/percona/pmm-admin",
-    "sources/pmm-agent/src/github.com/percona/pmm-agent",
     "sources/pmm-managed/src/github.com/percona/pmm-managed",
     "sources/pmm-server",
     "sources/pmm-update/src/github.com/percona/pmm-update",
diff --git a/ci-default.yml b/ci-default.yml
index 91139f93d354..3d3595d68160 100644
--- a/ci-default.yml
+++ b/ci-default.yml
@@ -7,18 +7,6 @@ deps:
     component: common
 
   # CLIENT
-  - name: pmm-admin
-    branch: main
-    path: sources/pmm-admin/src/github.com/percona/pmm-admin
-    url: https://github.com/percona/pmm-admin
-    component: client
-
-  - name: pmm-agent
-    branch: main
-    path: sources/pmm-agent/src/github.com/percona/pmm-agent
-    url: https://github.com/percona/pmm-agent
-    component: client
-
   - name: node_exporter
     branch: main
     path: sources/node_exporter/src/github.com/prometheus/node_exporter
diff --git a/ci.yml b/ci.yml
index e69de29bb2d1..44e996faaa45 100644
--- a/ci.yml
+++ b/ci.yml
@@ -0,0 +1,6 @@
+deps:
+  - name: pmm
+    branch: PMM-9968-pmm-admin-inventory-with-log-level
+
+  - name: pmm-managed
+    branch: PMM-9968-pmm-admin-inventory-with-log-level
diff --git a/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller b/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
index 3b1d4c724238..eba0b2a725cb 160000
--- a/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
+++ b/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
@@ -1 +1 @@
-Subproject commit 3b1d4c724238026929487724fe1a6a90782221a5
+Subproject commit eba0b2a725cb72f8d8ec534cff0518903e5591c2
diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin
deleted file mode 160000
index 5dd950267e14..000000000000
--- a/sources/pmm-admin/src/github.com/percona/pmm-admin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5dd950267e14dbf9a22045acf4b16ae2f54a7383
diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent
deleted file mode 160000
index 4d163c8943fd..000000000000
--- a/sources/pmm-agent/src/github.com/percona/pmm-agent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d163c8943fdf6370de0d6218f11bc9e4df81fd9
diff --git a/sources/pmm-dump b/sources/pmm-dump
index 53f3028d2761..a3b2196a74c7 160000
--- a/sources/pmm-dump
+++ b/sources/pmm-dump
@@ -1 +1 @@
-Subproject commit 53f3028d276184199301cca8ff06d55a3a8b4691
+Subproject commit a3b2196a74c7c85b43930d0bc6a5e1aae2cae254
diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
index f4658185309a..7f3122846086 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 f4658185309a4200429c42282aa81eb4e4b11922
+Subproject commit 7f3122846086e7a3c40b2950e5d8c4eb63ae3016
diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa
index 83583f03062a..c07ed7751810 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 83583f03062a1b0ffd79b7afa8690b4cbf9feac2
+Subproject commit c07ed7751810cd22d25840d4b6c1fe4f21964336
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 7f0b0c17587d..198fb02d380c 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 7f0b0c17587dd0957cd1b5127ae68ced67320e16
+Subproject commit 198fb02d380cdb9ba649d3f7b927fdf518bcb6f7
diff --git a/sources/pmm-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update
index 619e14a24580..6f4e654899ab 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 619e14a24580e0f9d5d08e6abc1e290558637630
+Subproject commit 6f4e654899abd7d0737855d609a273eb2b22e364
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
index 23069cdf1bb8..81b1211338ee 160000
--- a/sources/pmm/src/github.com/percona/pmm
+++ b/sources/pmm/src/github.com/percona/pmm
@@ -1 +1 @@
-Subproject commit 23069cdf1bb886cb2b82b9814ecb62ff67a362b8
+Subproject commit 81b1211338ee49a2fcabbb5fc1bdaf7f19016fc4