diff --git a/files/build_scripts/mask_disabled_services.py b/files/build_scripts/mask_disabled_services.py
new file mode 100755
index 000000000000..e2597ac686f1
--- /dev/null
+++ b/files/build_scripts/mask_disabled_services.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+import json
+import subprocess
+
+INIT_CFG_FILE_PATH = '/etc/sonic/init_cfg.json'
+
+with open(INIT_CFG_FILE_PATH) as init_cfg_file:
+    init_cfg = json.load(init_cfg_file)
+    if 'FEATURE' in init_cfg:
+        for feature_name, feature_props in init_cfg['FEATURE'].items():
+            if 'status' in feature_props and feature_props['status'] == 'disabled':
+                subprocess.run(['systemctl', 'mask', '{}.service'.format(feature_name)])
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 2488da1c2061..635084fd5414 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -27,6 +27,7 @@ set -x -e
 CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 
 . functions.sh
+BUILD_SCRIPTS_DIR=files/build_scripts
 BUILD_TEMPLATES=files/build_templates
 IMAGE_CONFIGS=files/image_config
 SCRIPTS_DIR=files/scripts
@@ -559,3 +560,9 @@ sudo chown -R $FRR_USER_UID:$FRR_USER_GID $FILESYSTEM_ROOT/etc/sonic/frr
 sudo chmod -R 640 $FILESYSTEM_ROOT/etc/sonic/frr/
 sudo chmod 750 $FILESYSTEM_ROOT/etc/sonic/frr
 {%- endif %}
+
+# Mask services which are disabled by default
+sudo cp $BUILD_SCRIPTS_DIR/mask_disabled_services.py $FILESYSTEM_ROOT/tmp/
+sudo chmod a+x $FILESYSTEM_ROOT/tmp/mask_disabled_services.py
+sudo LANG=C chroot $FILESYSTEM_ROOT /tmp/mask_disabled_services.py
+sudo rm -rf $FILESYSTEM_ROOT/tmp/mask_disabled_services.py