diff --git a/meta/lib/rootfspostcommands.py b/meta/lib/rootfspostcommands.py
index e344ae2efc..5386eea409 100644
--- a/meta/lib/rootfspostcommands.py
+++ b/meta/lib/rootfspostcommands.py
@@ -73,6 +73,8 @@ def remove_shadowutils_backup_files(sysconfdir):
             'gshadow',
             'passwd',
             'shadow',
+            'subgid',
+            'subuid',
         ):
         filepath = os.path.join(sysconfdir, filename)
         remove_shadowutils_backup_file(filepath)