diff --git a/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg
index 41b2b8de63..a7fad00c75 100644
Binary files a/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/analytics/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/analytics/google-services.json.gpg b/scripts/gha-encrypted/analytics/google-services.json.gpg
index cc73d92f29..8e2a09d363 100644
Binary files a/scripts/gha-encrypted/analytics/google-services.json.gpg and b/scripts/gha-encrypted/analytics/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg
index a3403e4542..c23fa61c31 100644
Binary files a/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/app/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/app/google-services.json.gpg b/scripts/gha-encrypted/app/google-services.json.gpg
index b244d8ffcd..05ef8e1d38 100644
Binary files a/scripts/gha-encrypted/app/google-services.json.gpg and b/scripts/gha-encrypted/app/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg
index a1df2ac0c8..7147f4df2a 100644
Binary files a/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/app_check/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/app_check/app_check_token.txt.gpg b/scripts/gha-encrypted/app_check/app_check_token.txt.gpg
index 86502b1de0..6c5dd80f56 100644
Binary files a/scripts/gha-encrypted/app_check/app_check_token.txt.gpg and b/scripts/gha-encrypted/app_check/app_check_token.txt.gpg differ
diff --git a/scripts/gha-encrypted/app_check/google-services.json.gpg b/scripts/gha-encrypted/app_check/google-services.json.gpg
index c69f5d33d0..4c433f4e03 100644
Binary files a/scripts/gha-encrypted/app_check/google-services.json.gpg and b/scripts/gha-encrypted/app_check/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg
index c3d4f09eee..896aeabf09 100644
Binary files a/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/auth/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/auth/google-services.json.gpg b/scripts/gha-encrypted/auth/google-services.json.gpg
index 750b8049c5..9f86b0a3f0 100644
Binary files a/scripts/gha-encrypted/auth/google-services.json.gpg and b/scripts/gha-encrypted/auth/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg
index dee0488e07..9d7f62a886 100644
Binary files a/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/database/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/database/google-services.json.gpg b/scripts/gha-encrypted/database/google-services.json.gpg
index fea24ec816..a9421faae4 100644
Binary files a/scripts/gha-encrypted/database/google-services.json.gpg and b/scripts/gha-encrypted/database/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg
index de36a45f3a..7d577bef1b 100644
Binary files a/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/dynamic_links/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/dynamic_links/google-services.json.gpg b/scripts/gha-encrypted/dynamic_links/google-services.json.gpg
index 65e64171ce..0db36dbf67 100644
Binary files a/scripts/gha-encrypted/dynamic_links/google-services.json.gpg and b/scripts/gha-encrypted/dynamic_links/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg b/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg
index 8e0a86d83e..4806b1830e 100644
Binary files a/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg and b/scripts/gha-encrypted/dynamic_links/uri_prefix.txt.gpg differ
diff --git a/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg
index 10b767212b..4ae5fb4154 100644
Binary files a/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/firestore/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/firestore/google-services.json.gpg b/scripts/gha-encrypted/firestore/google-services.json.gpg
index e68131024e..9807334757 100644
Binary files a/scripts/gha-encrypted/firestore/google-services.json.gpg and b/scripts/gha-encrypted/firestore/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg
index 5d5fd9d237..6ed5b9d8f0 100644
Binary files a/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/functions/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/functions/google-services.json.gpg b/scripts/gha-encrypted/functions/google-services.json.gpg
index 38bbb36bc1..c9edac069d 100644
Binary files a/scripts/gha-encrypted/functions/google-services.json.gpg and b/scripts/gha-encrypted/functions/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/gcs_key_file.json.gpg b/scripts/gha-encrypted/gcs_key_file.json.gpg
index 15fbf850d2..d792ec8bb6 100644
Binary files a/scripts/gha-encrypted/gcs_key_file.json.gpg and b/scripts/gha-encrypted/gcs_key_file.json.gpg differ
diff --git a/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg
index c43db0afa2..65b703ce7e 100644
Binary files a/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/gma/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/gma/google-services.json.gpg b/scripts/gha-encrypted/gma/google-services.json.gpg
index c4fb97533c..c46f596425 100644
Binary files a/scripts/gha-encrypted/gma/google-services.json.gpg and b/scripts/gha-encrypted/gma/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg
index bd3777a19a..ec47259fe0 100644
Binary files a/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/installations/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/installations/google-services.json.gpg b/scripts/gha-encrypted/installations/google-services.json.gpg
index 87f969e34a..ca21cd1005 100644
Binary files a/scripts/gha-encrypted/installations/google-services.json.gpg and b/scripts/gha-encrypted/installations/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg
index fdbff29584..cf95c652d8 100644
Binary files a/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/messaging/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/messaging/google-services.json.gpg b/scripts/gha-encrypted/messaging/google-services.json.gpg
index 60646cbdf9..8ad06ccf68 100644
Binary files a/scripts/gha-encrypted/messaging/google-services.json.gpg and b/scripts/gha-encrypted/messaging/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg
index 40e7cddc02..ea9dc94610 100644
Binary files a/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/remote_config/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/remote_config/google-services.json.gpg b/scripts/gha-encrypted/remote_config/google-services.json.gpg
index a62a8a6c1b..b9dd70a0f3 100644
Binary files a/scripts/gha-encrypted/remote_config/google-services.json.gpg and b/scripts/gha-encrypted/remote_config/google-services.json.gpg differ
diff --git a/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg b/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg
index 06bc08010a..01d28ec9c6 100644
Binary files a/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg and b/scripts/gha-encrypted/storage/GoogleService-Info.plist.gpg differ
diff --git a/scripts/gha-encrypted/storage/google-services.json.gpg b/scripts/gha-encrypted/storage/google-services.json.gpg
index 481d6bd168..57ba134aa5 100644
Binary files a/scripts/gha-encrypted/storage/google-services.json.gpg and b/scripts/gha-encrypted/storage/google-services.json.gpg differ
diff --git a/scripts/gha/restore_secrets.py b/scripts/gha/restore_secrets.py
index 93aefcfd72..1c34010dd7 100644
--- a/scripts/gha/restore_secrets.py
+++ b/scripts/gha/restore_secrets.py
@@ -169,7 +169,8 @@ def _decrypt(encrypted_file, passphrase):
           encrypted_file],
       check=False,
       text=True,
-      capture_output=True)
+      capture_output=True,
+      encoding="cp1252")
   if result.returncode:
     # Remove any instances of the passphrase from error before logging it.
     raise RuntimeError(result.stderr.replace(passphrase, "****"))
@@ -183,10 +184,14 @@ def _patch_reverse_id(service_plist_path):
   print("Attempting to patch reverse id in Info.plist")
   with open(service_plist_path, "rb") as f:
     service_plist = plistlib.load(f)
-  _patch_file(
-      path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"),
-      placeholder="REPLACE_WITH_REVERSED_CLIENT_ID",
-      value=service_plist["REVERSED_CLIENT_ID"])
+
+  try:
+    _patch_file(
+        path=os.path.join(os.path.dirname(service_plist_path), "Info.plist"),
+        placeholder="REPLACE_WITH_REVERSED_CLIENT_ID",
+        value=service_plist["REVERSED_CLIENT_ID"])
+  except KeyError as e:
+    print("No REVERSED_CLIENT_ID in plist, skipping.")
 
 
 def _patch_bundle_id(service_plist_path):