diff --git a/scripts/prepare_slave_container_buildinfo.sh b/scripts/prepare_slave_container_buildinfo.sh
index d66bbe8161..be6fe078bd 100755
--- a/scripts/prepare_slave_container_buildinfo.sh
+++ b/scripts/prepare_slave_container_buildinfo.sh
@@ -4,6 +4,9 @@ SLAVE_DIR=$1
 ARCH=$2
 DISTRO=$3
 
+# Install the latest debian package sonic-build-hooks in the slave container
+sudo dpkg -i --force-overwrite $SLAVE_DIR/buildinfo/sonic-build-hooks_*.deb > /dev/null
+
 # Enable the build hooks
 symlink_build_hooks
 
diff --git a/scripts/versions_manager.py b/scripts/versions_manager.py
index 59621cdfbb..336568bfb4 100755
--- a/scripts/versions_manager.py
+++ b/scripts/versions_manager.py
@@ -190,6 +190,8 @@ class VersionModule:
             if ctype not in ctype_components:
                 ctype_components[ctype] = []
         for components in ctype_components.values():
+            if len(components) == 0:
+                continue
             config_component = self._get_config_for_ctype(components, dist, arch)
             config_components.append(config_component)
         config_module = VersionModule(self.name, config_components)