diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 9d8c0ef066..bcdebb7413 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -37,7 +37,7 @@ infra/tools/luci/vpython3/${platform} git_revision:ad0c4b622c7d4cee870f57eed8170
 infra/tools/luci/led/${platform} git_revision:a095a06b3c202445e01b75d5690a8587cbc3ab7d
 
 # LUCI config generator
-infra/tools/luci/lucicfg/${platform} git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
+infra/tools/luci/lucicfg/${platform} git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
 
 # Mac toolchain installer
 infra/tools/mac_toolchain/${os=mac}-${arch} git_revision:59b5b4b5a506dc23eae31ef0f5b168281c6521da
diff --git a/cipd_manifest.versions b/cipd_manifest.versions
index e984d31099..e911f9c260 100644
--- a/cipd_manifest.versions
+++ b/cipd_manifest.versions
@@ -518,68 +518,68 @@ infra/tools/luci/luci-auth-ssh-plugin/windows-arm64
 	HqHn_7ADF4Z8gSD-qRASZ3O5XDcqQ1R3JY9JjLOr3ScC
 
 infra/tools/luci/lucicfg/linux-386
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	tSGKKv1MMHLPJmKdt9rnHk4uivDQYUbN-E2K_WQncfIC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	rD8XQ6U5a5QeDq12Cw-bkxXwYV43CpSsUQN4ChXetBUC
 
 infra/tools/luci/lucicfg/linux-amd64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	oSrFvDlXK3MSfPzPvhMupsPrNXN-SLP7caJfstLaOYMC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	zRepGwMBd4D0XApd0mQGhiLoT-WvtU0cGjbadxDbl0IC
 
 infra/tools/luci/lucicfg/linux-arm64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	J_HfRXiVjYpiSJ28G6a27Ch3CGRiFBZTqbmFpC35weQC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	HU11VoHIIvtCAqGwDtUsn98uMp6LQ3ZeRZpYa3HNwH8C
 
 infra/tools/luci/lucicfg/linux-armv6l
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	GZ0HM6tj8lnXdtwFq674AzayWRpOmdw_n7Zb5v-faXMC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	M_-A7vIDYuFXBHlHQ3jJsV0mKZHfNDnE2wPN3looRBUC
 
 infra/tools/luci/lucicfg/linux-loong64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	gcCHvYEC4WsXcBjUvH4E_PM-5gWIsKI1yxSamwxvbiMC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	PTRVFT47hFUAlPj6h-IOL3jtIUOWUgjcd3mDI_WwVRQC
 
 infra/tools/luci/lucicfg/linux-mips64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	va1DZoYknk63BI7y-RULjZZG7plq6OAE1Yob1IJEcLYC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	_Uz24cCfTdHPeftejMH9oRso-acRo3TfQmjRa0qtG50C
 
 infra/tools/luci/lucicfg/linux-mips64le
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	OOgqlyyFUS9-FCC3AmPVkF2voed0UHfe2xyEtxNC4c0C
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	sRtH3WL47Vyq1Q0QEPzezq61ny6_nqS0nSuErx76BvwC
 
 infra/tools/luci/lucicfg/linux-mipsle
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	4pZU0nwhZ_zmzJLexLfqBCt4uF5q-Q0835C_asWslfYC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	gwag2cwxYk2Yq-YiDUnzAMn1dG66w0rtJcWgOqJTqOwC
 
 infra/tools/luci/lucicfg/linux-ppc64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	-HqJMLMKGH1QEYOJNnVRqPEqugJotnjNKdur2F7o7j4C
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	GkH8h5B1vm3leePH62VUlOntJjPGYwxBc35nvkSTfQoC
 
 infra/tools/luci/lucicfg/linux-ppc64le
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	L6P521LwnbmnTYS1H1EOfJgcBR7oVAwHHvcANxEL1DYC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	w3McAyHHVwOPbM0zoYebkF43Oyni3rLSsihDUAmJnFMC
 
 infra/tools/luci/lucicfg/linux-riscv64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	eqWYDFEL_W9_eoKgF1_XJXM2UaKGe0RFwFv-xp75yAIC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	pvUiuceSe9n2n6gIncohD2HpFVwhnv3MCmQrfAlUwegC
 
 infra/tools/luci/lucicfg/linux-s390x
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	hlOLF67h_zteFLCZT3TVrqK7THRicm924eiMUsWg5eIC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	kkljbjcxhjz28iExdTneMFv_vTOYjO2vF5dmBoGasQ0C
 
 infra/tools/luci/lucicfg/mac-amd64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	18SHHIT7jhJB75-76kfhFI4NRYiU5YeRIyf_qzUb3mUC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	aTSk4-SDQFdNhB6UkbJNmz1GEHQME_V8tfp7o2j2t_QC
 
 infra/tools/luci/lucicfg/mac-arm64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	UKGVcPB4Ug55UxS_nQyGvcJmum4z_dELAFh4MsTBam0C
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	Ab1U6J-ZWnJ3p9WPVen8uJQaQXx2wtYmqOY4Yf_9_lYC
 
 infra/tools/luci/lucicfg/windows-amd64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	0FFEyKeveTJsHykx0pUTQ4LuM1vgDrHllksCqMZjuTcC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	rNisjcvYdzEEe1x3NRIBEd0SMEcBSKXG6T0BQnX-OsQC
 
 infra/tools/luci/lucicfg/windows-arm64
-	git_revision:8098fe45159459f4381cfc4e1863f490aa70c062
-	TY__bn7h42wSCalymUh_0VUIjnSHQhXCdxXuSrUZGksC
+	git_revision:d3f39cbe9d7326d6c9b8d6c7b6dbd060a1965afa
+	bwDW6L1FllgJ1GHZjoLLonJdyLSC8BfgSHV-lrTe9okC
 
 infra/tools/luci/vpython3/linux-386
 	git_revision:ad0c4b622c7d4cee870f57eed8170c059ca42ed3