diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index a68f3b980..ad7df8104 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -63,8 +63,8 @@ infra/tools/rdb/${platform} git_revision:e751fc6ba3f2e03ce1b9846a8a9697eeb186f67
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 
 # goma client
-infra/goma/client/${os=linux,windows}-${arch=amd64} git_revision:93f92a71431849be697d91c74052595a56c237e6
-infra/goma/client/${os=mac}-${arch} git_revision:93f92a71431849be697d91c74052595a56c237e6
+infra/goma/client/${os=linux,windows}-${arch=amd64} git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
+infra/goma/client/${os=mac}-${arch} git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
 
 # dirmd, a tool to work with DIR_METADATA files
 infra/tools/dirmd/${platform} git_revision:c7072c98f7ac3ce1998542cc5637bdc54f908f4a
diff --git a/cipd_manifest.versions b/cipd_manifest.versions
index 3bbb25436..fd3cd78f4 100644
--- a/cipd_manifest.versions
+++ b/cipd_manifest.versions
@@ -58,20 +58,20 @@ infra/chromeperf/pinpoint/windows-amd64
 	a7JgaCNO20z7yfb6y5xZNRjjybTy-cmDSjpeNOCJhS0C
 
 infra/goma/client/linux-amd64
-	git_revision:93f92a71431849be697d91c74052595a56c237e6
-	W889aE-5ycxUMc79jvkWFEQwUq2bdu7HB87GYmktUIEC
+	git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
+	ItsTR9d6uwrTo1QLXY_Gc36guMTk36mn1I0Uwkp5MA8C
 
 infra/goma/client/mac-amd64
-	git_revision:93f92a71431849be697d91c74052595a56c237e6
-	0FkzQIAXHH_cuCCvv8ZtzSLJWs6KYa2U1W3OFUylanoC
+	git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
+	2olEIvKwpPF4JTd_RyAEBdGzYHqLeWEqqQcaKb74qjsC
 
 infra/goma/client/mac-arm64
-	git_revision:93f92a71431849be697d91c74052595a56c237e6
-	dxzmgbp5rfNXVS3YXMApsIWcZZsHhgu9_9s_v3Ij4MIC
+	git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
+	TrCxEXIGuQMJVIds-u2SrgJF_GqPvRAyKvuhREvNxgcC
 
 infra/goma/client/windows-amd64
-	git_revision:93f92a71431849be697d91c74052595a56c237e6
-	YYTlxXwCOYDsUOlW8uNsEBsXKQBKxCeparlfFGnIvCAC
+	git_revision:31bb6ec236fa12c6a3ebef4f6edce125136bc685
+	VNhJGiJk1kZWtkXx22N-W519Zya2EDBwnKYReNu2QU0C
 
 infra/tools/bb/linux-386
 	git_revision:1563088c23532d1e45b8c3041afb9458c1788fc3