diff --git a/files/image_config/bannerconfig/banner-config.sh b/files/image_config/bannerconfig/banner-config.sh
index b81b342bf52..5c605a034ea 100755
--- a/files/image_config/bannerconfig/banner-config.sh
+++ b/files/image_config/bannerconfig/banner-config.sh
@@ -1,14 +1,14 @@
 #!/bin/bash -e
 
-STATE=$(sonic-cfggen -d -v 'BANNER_MESSAGE["global"]["state"]')
+STATE=$(sonic-db-cli CONFIG_DB HGET 'BANNER_MESSAGE|global' state)
 LOGIN=
 MOTD=
 LOGOUT=
 
 if [[ $STATE == "enabled" ]]; then
-    LOGIN=$(sonic-cfggen -d -v 'BANNER_MESSAGE["global"]["login"]')
-    MOTD=$(sonic-cfggen -d -v 'BANNER_MESSAGE["global"]["motd"]')
-    LOGOUT=$(sonic-cfggen -d -v 'BANNER_MESSAGE["global"]["logout"]')
+    LOGIN=$(sonic-db-cli CONFIG_DB HGET 'BANNER_MESSAGE|global' login)
+    MOTD=$(sonic-db-cli CONFIG_DB HGET 'BANNER_MESSAGE|global' motd)
+    LOGOUT=$(sonic-db-cli CONFIG_DB HGET 'BANNER_MESSAGE|global' logout)
 
     echo -e "$LOGIN" > /etc/issue.net
     echo -e "$LOGIN" > /etc/issue
diff --git a/files/image_config/hostname/hostname-config.sh b/files/image_config/hostname/hostname-config.sh
index 5f4bfede209..91b0b7b32f9 100755
--- a/files/image_config/hostname/hostname-config.sh
+++ b/files/image_config/hostname/hostname-config.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
-CURRENT_HOSTNAME=`hostname`
-HOSTNAME=`sonic-cfggen -d -v DEVICE_METADATA[\'localhost\'][\'hostname\']`
+CURRENT_HOSTNAME=$(hostname)
+HOSTNAME=$(sonic-db-cli CONFIG_DB HGET 'DEVICE_METADATA|localhost' hostname)
 
 if [ -z "$HOSTNAME" ] ; then
        echo "Missing hostname in the config file, setting to default 'sonic'"