diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 2f861bbbd405..66e86774e766 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -94,7 +94,9 @@ clean_flash() {
            [ $f != "$cmdline_base" ] &&
            [ $f != "aquota.user" ] &&
            [ $f != "old_config" ] &&
-           [ $f != "minigraph.xml" ]
+           [ $f != "minigraph.xml" ] &&
+           [ $f != "snmp.yml" ] &&
+           [ $f != "acl.json" ]
         then
             rm -rf "$target_path/$f"
         fi
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index 190743285644..b74e9f40c4b0 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -223,6 +223,8 @@ if [ -f $FIRST_BOOT_FILE ]; then
     elif [ -f /host/minigraph.xml ]; then
         mkdir -p /etc/sonic/old_config
         mv /host/minigraph.xml /etc/sonic/old_config/
+        [ -f /host/acl.json ] && mv /host/acl.json /etc/sonic/old_config/
+        [ -f /host/snmp.yml ] && mv /host/snmp.yml /etc/sonic/old_config/
         touch /tmp/pending_config_migration
     elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ];  then
         mkdir -p /etc/sonic/old_config