diff --git a/.final_builds/packages/metrics-agent-windows/index.yml b/.final_builds/packages/metrics-agent-windows/index.yml
index 87a01ef0..429c1564 100644
--- a/.final_builds/packages/metrics-agent-windows/index.yml
+++ b/.final_builds/packages/metrics-agent-windows/index.yml
@@ -75,6 +75,10 @@ builds:
     version: c75e1b10d2db91b768773693314dfaa7001b7bbdb9a6c7798627cdf15179c18b
     blobstore_id: e935b6ee-5dcd-4246-642b-12c8148fdbac
     sha1: sha256:0a3263be126d42c6e2688401f6754706951890111f19b0c2f478925ccb2f9c16
+  cb7de1fdd1eee94634cc0e797b1ab584052226d5cc0699b70d91413dc50c483d:
+    version: cb7de1fdd1eee94634cc0e797b1ab584052226d5cc0699b70d91413dc50c483d
+    blobstore_id: 44215329-0ae4-42ac-7e51-023bb8a57d15
+    sha1: sha256:bed05f4e765e65776f2331833c8d81f8ec88c6f8299017526d5e3965657a0247
   cef22dfe91896cdb97568e3b0d762b4550cb7a24323a4092b98816066832d5e9:
     version: cef22dfe91896cdb97568e3b0d762b4550cb7a24323a4092b98816066832d5e9
     blobstore_id: 9091b6d4-a9d6-452b-42ac-a1199ef6c0fa
diff --git a/.final_builds/packages/metrics-agent/index.yml b/.final_builds/packages/metrics-agent/index.yml
index 1448949c..6d9e157a 100644
--- a/.final_builds/packages/metrics-agent/index.yml
+++ b/.final_builds/packages/metrics-agent/index.yml
@@ -55,6 +55,10 @@ builds:
     version: 59741e994b0202f85fe0190606cd3f80ddfb61977fa1919003d69cbd9c30dd3f
     blobstore_id: df0ab988-eba3-4ab0-5ac2-24dad42f6130
     sha1: sha256:ef8cae2e22b7bea4ccd482e4893c8b3ce33763d3111545fe74d5f81946d7d73d
+  7eec3fd7c279300e6a22614f15c8eee24c29a4a8258fdfa258ebe7eb07292fc1:
+    version: 7eec3fd7c279300e6a22614f15c8eee24c29a4a8258fdfa258ebe7eb07292fc1
+    blobstore_id: d353891a-4d6f-4b91-79a2-d466be185ef7
+    sha1: sha256:f4f185a98aae56707853f7c6b4490270c1509f0de9fc9085a277e58d093ba52f
   95c1e1cf2516f644ca136370f8648144139bd46a72ba868ba9f0ee2b7ba9f525:
     version: 95c1e1cf2516f644ca136370f8648144139bd46a72ba868ba9f0ee2b7ba9f525
     blobstore_id: e0bdd11e-f54d-47f2-65df-1ab3073b99c9
diff --git a/.final_builds/packages/metrics-discovery-registrar-windows/index.yml b/.final_builds/packages/metrics-discovery-registrar-windows/index.yml
index d7a8da40..062d9029 100644
--- a/.final_builds/packages/metrics-discovery-registrar-windows/index.yml
+++ b/.final_builds/packages/metrics-discovery-registrar-windows/index.yml
@@ -91,6 +91,10 @@ builds:
     version: bb91a40b733021c6b03845eb3b97d87c37b5340c809713fb6e34048f375f5bb5
     blobstore_id: 322d1178-e8c3-4ffc-4a53-282631836a7d
     sha1: sha256:4e0557cfb3bf26899db75079a929fb26246f90b9d90b629fcda5ff277dc894bb
+  cb013365f1f4d5269b71c5241139aed96bfd81de3797a54ad35d2ce92f9a0ebb:
+    version: cb013365f1f4d5269b71c5241139aed96bfd81de3797a54ad35d2ce92f9a0ebb
+    blobstore_id: 8979191d-8f41-4647-6e51-b5badc8abb8f
+    sha1: sha256:963da9637427cd250f1a458e44e7d1bad8bff5e6e8fd958323ec6ac1ff69edb3
   cfe58aaab488cec80325cfb8bea208ea7afa9e2a33ae36d5543b4a389957d2f0:
     version: cfe58aaab488cec80325cfb8bea208ea7afa9e2a33ae36d5543b4a389957d2f0
     blobstore_id: 05089bbc-d2e8-4100-646f-88a2a812bb09
diff --git a/.final_builds/packages/metrics-discovery-registrar/index.yml b/.final_builds/packages/metrics-discovery-registrar/index.yml
index fa787269..97afc915 100644
--- a/.final_builds/packages/metrics-discovery-registrar/index.yml
+++ b/.final_builds/packages/metrics-discovery-registrar/index.yml
@@ -47,6 +47,10 @@ builds:
     version: 6b99d966e8b412e4fe692e4a4260e471cda38da2a8d1fc6d201bfd578918fbf0
     blobstore_id: ed1b4732-192a-4512-7d79-e5c9d8d799e0
     sha1: sha256:26608c8521e54721bc9bcbbf4ccb25c34c3bfc9fbf6d57f7ad3069ee86d95e79
+  75d3673beda6b9108cf879e09fbffe599ef8c7b018cb0d9134ed6f7f418a6cc3:
+    version: 75d3673beda6b9108cf879e09fbffe599ef8c7b018cb0d9134ed6f7f418a6cc3
+    blobstore_id: 2c8ef24f-ae03-4660-4a0d-e650c45d471c
+    sha1: sha256:c4609038425b7fdc8470b8cb0c84de442ad381ae3c711f33182ef52f7009e554
   7ed6c579959f140eaa7e91eb07adca43f58e6bfbe60043b6620016059e362109:
     version: 7ed6c579959f140eaa7e91eb07adca43f58e6bfbe60043b6620016059e362109
     blobstore_id: 27bff7b1-450b-4aaa-6943-447a43d03e57
diff --git a/.final_builds/packages/scrape-config-generator/index.yml b/.final_builds/packages/scrape-config-generator/index.yml
index 94ed4e75..759a32e6 100644
--- a/.final_builds/packages/scrape-config-generator/index.yml
+++ b/.final_builds/packages/scrape-config-generator/index.yml
@@ -83,6 +83,10 @@ builds:
     version: 8e332cec54b578de70cfe2c427a3697fbf277720dd016c560fd226c82ab2f821
     blobstore_id: e85bd0ec-3c34-4a00-7f9f-83d6c9c75193
     sha1: sha256:1327adb6c1c37f4d6a3a4cbc66f895ea8dfec64b27d20b0c8e42eb4fecc87876
+  9702da1ddd359f22468b34ec246ded64f720a102e6a53227e652890ab2ce9fb2:
+    version: 9702da1ddd359f22468b34ec246ded64f720a102e6a53227e652890ab2ce9fb2
+    blobstore_id: d7d204cd-8024-4549-6852-a81bb0620b82
+    sha1: sha256:ffcb0de65cff27114a16ec8df4ef7462cfb28476c4bcd5b1bff1a36a570ce080
   a649d0964734618b647ab8582cbf6e8fa7414621bbebd60a4dcb297b85871c85:
     version: a649d0964734618b647ab8582cbf6e8fa7414621bbebd60a4dcb297b85871c85
     blobstore_id: 58b3259f-f4d9-4df0-460c-623ab3976287
diff --git a/releases/metrics-discovery/index.yml b/releases/metrics-discovery/index.yml
index adaf7757..aa95e91c 100644
--- a/releases/metrics-discovery/index.yml
+++ b/releases/metrics-discovery/index.yml
@@ -39,6 +39,8 @@ builds:
     version: 3.2.14
   72655fef-10f1-4297-656b-ab92de474660:
     version: 3.2.17
+  7974f879-29ad-47f1-65e0-349c43fd5315:
+    version: 3.2.21
   7ad1c95b-8243-443f-7417-68df901bbd77:
     version: 3.2.11
   7cde8543-d7de-4730-62a4-a43c7f087e42:
diff --git a/releases/metrics-discovery/metrics-discovery-3.2.21.yml b/releases/metrics-discovery/metrics-discovery-3.2.21.yml
new file mode 100644
index 00000000..2246d99a
--- /dev/null
+++ b/releases/metrics-discovery/metrics-discovery-3.2.21.yml
@@ -0,0 +1,80 @@
+name: metrics-discovery
+version: 3.2.21
+commit_hash: 02c845ad
+uncommitted_changes: false
+jobs:
+- name: metrics-agent
+  version: 32da6cc50210d76366b7c0d6e6e21716f24a73b170cb0d581fdd122fff8a6e2c
+  fingerprint: 32da6cc50210d76366b7c0d6e6e21716f24a73b170cb0d581fdd122fff8a6e2c
+  sha1: sha256:419cd1ac5fd9b4d8fcb53d75ab490777198bcb8983aa1ecbe7e02f4f36e727ed
+  packages:
+  - metrics-agent
+- name: metrics-agent-windows
+  version: f255693a25facf537af6c2196b32221d00f9c80038694982d2fb2711cc863c47
+  fingerprint: f255693a25facf537af6c2196b32221d00f9c80038694982d2fb2711cc863c47
+  sha1: sha256:a1226c618ee289a6777c7fc5ec6827cf42f8006f3778a9b714a1c2db48ab7c0c
+  packages:
+  - metrics-agent-windows
+- name: metrics-discovery-registrar
+  version: 068649bf5567c96ba1235e67b44bc0b4054a9491d71c9eb3bf92ac791157fcd1
+  fingerprint: 068649bf5567c96ba1235e67b44bc0b4054a9491d71c9eb3bf92ac791157fcd1
+  sha1: sha256:01f7b9193be28950e426cf2e0ea13b068fe8661b403025ec74cb363a28290e41
+  packages:
+  - metrics-discovery-registrar
+- name: metrics-discovery-registrar-windows
+  version: 8283f7bad0152290edafbd9bcfdff7041877f92429e9ead4d4514ed0aa58a1a6
+  fingerprint: 8283f7bad0152290edafbd9bcfdff7041877f92429e9ead4d4514ed0aa58a1a6
+  sha1: sha256:435f7bf7d06b47f720381fc866eae4938275d82c26993f88a33120444715b11e
+  packages:
+  - metrics-discovery-registrar-windows
+- name: scrape-config-generator
+  version: c74baf4d66b199d3171f47ebaafef16a745ef5cd471047095ac6693ee07381ae
+  fingerprint: c74baf4d66b199d3171f47ebaafef16a745ef5cd471047095ac6693ee07381ae
+  sha1: sha256:01d22c07d1ed8eee4f07e65bdef621d49aee2f6c695174cf62ce85128b0eeb7e
+  packages:
+  - scrape-config-generator
+packages:
+- name: golang-1.20-linux
+  version: d2ed2f3fc2fa5d1832997a1f08b879ca7b91ed6838e55c08ad6198ac74afb652
+  fingerprint: d2ed2f3fc2fa5d1832997a1f08b879ca7b91ed6838e55c08ad6198ac74afb652
+  sha1: sha256:b82ce9cca40328da5a46daf0bccdcd1d5b5ec955d784ca6cd15195727f7a964e
+  dependencies: []
+- name: golang-1.20-windows
+  version: e6719b14cb0070095ce72b7fb5908c335e8165b5f9f100ffd6dd3f1d9b0069c4
+  fingerprint: e6719b14cb0070095ce72b7fb5908c335e8165b5f9f100ffd6dd3f1d9b0069c4
+  sha1: sha256:5df7d79de7e11b134ad52122e5e7fc15dd3c187db6ae6384493bcc57f3a634a7
+  dependencies: []
+- name: metrics-agent
+  version: 7eec3fd7c279300e6a22614f15c8eee24c29a4a8258fdfa258ebe7eb07292fc1
+  fingerprint: 7eec3fd7c279300e6a22614f15c8eee24c29a4a8258fdfa258ebe7eb07292fc1
+  sha1: sha256:f4f185a98aae56707853f7c6b4490270c1509f0de9fc9085a277e58d093ba52f
+  dependencies:
+  - golang-1.20-linux
+- name: metrics-agent-windows
+  version: cb7de1fdd1eee94634cc0e797b1ab584052226d5cc0699b70d91413dc50c483d
+  fingerprint: cb7de1fdd1eee94634cc0e797b1ab584052226d5cc0699b70d91413dc50c483d
+  sha1: sha256:bed05f4e765e65776f2331833c8d81f8ec88c6f8299017526d5e3965657a0247
+  dependencies:
+  - golang-1.20-windows
+- name: metrics-discovery-registrar
+  version: 75d3673beda6b9108cf879e09fbffe599ef8c7b018cb0d9134ed6f7f418a6cc3
+  fingerprint: 75d3673beda6b9108cf879e09fbffe599ef8c7b018cb0d9134ed6f7f418a6cc3
+  sha1: sha256:c4609038425b7fdc8470b8cb0c84de442ad381ae3c711f33182ef52f7009e554
+  dependencies:
+  - golang-1.20-linux
+- name: metrics-discovery-registrar-windows
+  version: cb013365f1f4d5269b71c5241139aed96bfd81de3797a54ad35d2ce92f9a0ebb
+  fingerprint: cb013365f1f4d5269b71c5241139aed96bfd81de3797a54ad35d2ce92f9a0ebb
+  sha1: sha256:963da9637427cd250f1a458e44e7d1bad8bff5e6e8fd958323ec6ac1ff69edb3
+  dependencies:
+  - golang-1.20-windows
+- name: scrape-config-generator
+  version: 9702da1ddd359f22468b34ec246ded64f720a102e6a53227e652890ab2ce9fb2
+  fingerprint: 9702da1ddd359f22468b34ec246ded64f720a102e6a53227e652890ab2ce9fb2
+  sha1: sha256:ffcb0de65cff27114a16ec8df4ef7462cfb28476c4bcd5b1bff1a36a570ce080
+  dependencies:
+  - golang-1.20-linux
+license:
+  version: d2660bcbd0571d7cf1652800677e81ede2425417a8955856e1440035205167c9
+  fingerprint: d2660bcbd0571d7cf1652800677e81ede2425417a8955856e1440035205167c9
+  sha1: sha256:5d9d9be92bb408ac52e43467ad600b2abc5e8ab7655a18d88396965ebbbad21f