diff --git a/scripts/prepare_slave_container_buildinfo.sh b/scripts/prepare_slave_container_buildinfo.sh
index 1fb2f00664..f1d8d8a767 100755
--- a/scripts/prepare_slave_container_buildinfo.sh
+++ b/scripts/prepare_slave_container_buildinfo.sh
@@ -10,6 +10,10 @@ sudo dpkg -i --force-overwrite $SLAVE_DIR/buildinfo/sonic-build-hooks_*.deb > /d
 # Enable the build hooks
 symlink_build_hooks
 
+# Enable reproducible mirrors
+set_reproducible_mirrors
+apt-get update > /dev/null 2>&1
+
 # Build the slave running config
 cp -rf $SLAVE_DIR/buildinfo/* /usr/local/share/buildinfo/
 . /usr/local/share/buildinfo/scripts/buildinfo_base.sh
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index c986e29a4e..a20684e97b 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -174,11 +174,20 @@ class VersionModule:
                 self.components.append(tmp_component)
         self.adjust()
 
-    def get_config_module(self, default_module, dist, arch):
+    def get_config_module(self, source_path, dist, arch):
         if self.is_individule_version():
             return self
+        default_module_path = VersionModule.get_module_path_by_name(source_path, DEFAULT_MODULE)
+        default_module = VersionModule()
+        default_module.load(default_module_path, filter_dist=dist, filter_arch=arch)
         module = default_module
-        if not self.is_aggregatable_module(self.name):
+        if self.name == 'host-image':
+            base_module_path = VersionModule.get_module_path_by_name(source_path, 'host-base-image')
+            base_module = VersionModule()
+            base_module.load(base_module_path, filter_dist=dist, filter_arch=arch)
+            module = default_module.clone(exclude_ctypes=DEFAULT_OVERWRITE_COMPONENTS)
+            module.overwrite(base_module, True, True)
+        elif not self.is_aggregatable_module(self.name):
             module = default_module.clone(exclude_ctypes=DEFAULT_OVERWRITE_COMPONENTS)
         return self._get_config_module(module, dist, arch)
 
@@ -661,10 +670,7 @@ class VersionManagerCommands:
             os.makedirs(args.target_path)
         module = VersionModule()
         module.load(module_path, filter_dist=args.distribution, filter_arch=args.architecture)
-        default_module_path = VersionModule.get_module_path_by_name(args.source_path, DEFAULT_MODULE)
-        default_module = VersionModule()
-        default_module.load(default_module_path, filter_dist=args.distribution, filter_arch=args.architecture)
-        config = module.get_config_module(default_module, args.distribution, args.architecture)
+        config = module.get_config_module(args.source_path, args.distribution, args.architecture)
         config.clean_info(force=True)
         config.dump(args.target_path, config=True, priority=args.priority)