diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index a981a28650..5a5686a6ea 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -42,7 +42,7 @@ infra/tools/luci/vpython/${platform} git_revision:7db81fdd219325d5d11fdaf56357ec
 infra/tools/luci/led/${platform} git_revision:5996f38bcf1d53582b3c62711271dc92782ce43d
 
 # LUCI config generator
-infra/tools/luci/lucicfg/${platform} git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
+infra/tools/luci/lucicfg/${platform} git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
 
 # Mac toolchain installer
 infra/tools/mac_toolchain/${os=mac}-${arch} git_revision:febf962fa9e6f5cc5c4ce86e8dab6ff6d91088dc
diff --git a/cipd_manifest.versions b/cipd_manifest.versions
index 98c40c50c5..61d78310a0 100644
--- a/cipd_manifest.versions
+++ b/cipd_manifest.versions
@@ -306,60 +306,60 @@ infra/tools/luci/led/windows-arm64
 	BaiG2mken3mRjCrfWOX60hbGe2bG8WCIjeIjkX5eF7IC
 
 infra/tools/luci/lucicfg/linux-386
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	C_302KHv3Iwt5S4xguCRec5BfVlxdSme0yA0DgJiD2YC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	XhQODtL9qJhPV5lX641Voe3oWs51hwrziHFIOdh93PIC
 
 infra/tools/luci/lucicfg/linux-amd64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	1TFlqWmEKu7Rm-z4bmapnb4370N9lztGxDSc-UCxZhEC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	qcUTBPCsOUpPyeTBKBO7EmcY16BtUYGz8O2RY3a5mw8C
 
 infra/tools/luci/lucicfg/linux-arm64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	NpnU6MpetJxdAJg9sI5l-uyd_ZLeX6LgOo8ZOHmG4mIC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	ct9DMDzOzpaWRUbwix-2bKBc-Yqz_3ho9Spis0QDBikC
 
 infra/tools/luci/lucicfg/linux-armv6l
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	qwWzD1yb-8wi1bNnFjdPtMzyCWCMGphv7aDicFkMwIEC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	0dRAzo8oYcJVmwEkMNeLEUyrw8cJK39F_QfhvAxZ8dsC
 
 infra/tools/luci/lucicfg/linux-mips64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	K2Na5aJvV3Tjy3UOUFURGc0AqT2USHkduz6vNApdz-kC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	c61tDu7F0xdpSd7OrNqyy-bvSjKwoX5T3b5ysEOhGXgC
 
 infra/tools/luci/lucicfg/linux-mips64le
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	8I_k8It1NCx9cs_q-9kPw8l1OW6KQZkPprEv6-84DpYC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	TUj4sJVj_OiZ_RFGmte2UqnxIZW5zkS_faoqVjzcYqQC
 
 infra/tools/luci/lucicfg/linux-mipsle
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	YONpSFTEHdK8FcsAZOX0amMYUqPJ7xhWSZN7tQiqqP8C
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	YT7Ismmdne6J1XYYU-WmALiLrLjoZ6CQErlVFTBdOgIC
 
 infra/tools/luci/lucicfg/linux-ppc64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	4v9J6F0rnE54ACRI9hJPJjcX7qGFqJyC99BauFreOH0C
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	VHBXFRg4HegAIxoo0KbntebGomjey_t36v9fe07rBU0C
 
 infra/tools/luci/lucicfg/linux-ppc64le
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	dY8YGLXsA3VUsu-f0w4G12C_yhQ-9q5ZdZF92PNBxu8C
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	TYEIW4LKLeOSIsAutfaDXtVv8FPURZINzGWoXCFK7RIC
 
 infra/tools/luci/lucicfg/linux-s390x
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	PnI25Hsu9W2QJUpurn0naBKO4p59ob9VdzXyYKkO6IEC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	zDdO6jgVXfBpHiG1KY2wUk12wZgX27TPMo56ZqHQpvsC
 
 infra/tools/luci/lucicfg/mac-amd64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	KnB6WYNd-QQsXgOkt_a3ZxyZsQb1jSwwCnG-r8LfoxkC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	pGvJcbjzR59YbphTRj51B-TaN3cQt2OLYFr3Mv1HUNMC
 
 infra/tools/luci/lucicfg/mac-arm64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	cY2lbeBRW9WLtg78g9lzkwRn30OjvfTaqcL2hPbJwX8C
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	tpRrr8IFNefgDHuhrd9CiuFGaRkGHg3FCKcVw-YGaN0C
 
 infra/tools/luci/lucicfg/windows-amd64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	LUncDHa1u2M9OSiWn5YT6BN6UrBB2v5u3AFiRaKiV9MC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	gBhaSXZPtQPBH-b4LjIEwQNjaOLwuB9M2m2wKLrkhC8C
 
 infra/tools/luci/lucicfg/windows-arm64
-	git_revision:8f0cb6ebb3decd050b134117d0058b99c1b448d4
-	Ot9cm0RHVTQIdmmq9o7Yo99Ao4UakTNKapSTRI_q8mMC
+	git_revision:c80314c5ce3ffb422861edd4f8531f5c94c5ba18
+	k640phpe4EYWAV8dmPqoTmVUlgpoc50Ui6cY4jHrdN4C
 
 infra/tools/luci/vpython/linux-386
 	git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3