diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
index d2d1d2f49..461781136 100644
--- a/scripts/sconsdist.py
+++ b/scripts/sconsdist.py
@@ -271,7 +271,13 @@ class Main(App):
                 self.note_dist_component(
                     "update", "tgz", self.get_dist_path(bundle_tgz)
                 )
-                tar.add(bundle_dir, arcname=bundle_dir_name)
+
+                # Strip uid and gid in case of overflow
+                def tar_filter(tarinfo):
+                    tarinfo.uid = tarinfo.gid = 0
+                    return tarinfo
+
+                tar.add(bundle_dir, arcname=bundle_dir_name, filter=tar_filter)
         return bundle_result