diff --git a/source/scripts/init/service.d/service_sshd.sh b/source/scripts/init/service.d/service_sshd.sh
index b004eade..8006a180 100755
--- a/source/scripts/init/service.d/service_sshd.sh
+++ b/source/scripts/init/service.d/service_sshd.sh
@@ -48,14 +48,6 @@ WAN_INTERFACE=$(getWanInterfaceName)
 DEFAULT_WAN_INTERFACE="erouter0"
 LANIPV6Support=`sysevent get LANIPv6GUASupport`
 DEVICE_MODE=`deviceinfo.sh -mode`
-DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]')
-if [ "$DEVICETYPE" = "TEST" ] && [ "$USE_DYNAMICKEYING" = "TRUE" ]; then
-    USE_DEVKEYS="-f authorized_keys_dev"
-    echo_t "[utopia]: dropbear using dev authorization keys"
-else
-    USE_DEVKEYS=""
-    echo_t "[utopia]: dropbear using prod authorization keys"
-fi
 
 if [ "$BOX_TYPE" = "HUB4" ] || [ "$BOX_TYPE" = "SR300" ] || [ "$BOX_TYPE" = "SE501" ] || [ "$BOX_TYPE" = "WNXL11BWL" ] || [ "$BOX_TYPE" = "SR213" ] ||  [ "$BOX_TYPE" == "SCER11BEL" ] || [ "$BOX_TYPE" == "SCXF11BFL" ] || [ "$BOX_TYPE" == "XER2" ]; then
    CMINTERFACE=$WAN_INTERFACE
@@ -157,6 +149,12 @@ do_start() {
       #chgrp admin $DIR_NAME
       #chmod 755 $DIR_NAME
    #fi
+    # Use prod keys only when both the build and deviceType RFC are prod; dev keys otherwise
+    USE_DEVKEYS="-f authorized_keys_dev"
+    DEVICETYPE=$(dmcli eRT getv Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType | grep value | cut -d ":" -f 3 | tr -d ' ' | tr -s ' ' | tr '[:lower:]' '[:upper:]')
+    if [ "$BUILD_TYPE" = "prod" -a "$DEVICETYPE" = "PROD" ]; then
+	    USE_DEVKEYS=""
+    fi
 
     if ([ "$BOX_TYPE" = "XB6" -a "$MANUFACTURE" = "Arris" ] || [ "$MODEL_NUM" = "INTEL_PUMA" ] || [ "$BOX_TYPE" = "VNTXER5" ] || [ "$BOX_TYPE" = "SCER11BEL" -a "$LANIPV6Support" != "true" ] || [ "$BOX_TYPE" = "SCXF11BFL" ] || [ "$BOX_TYPE" = "XER2" ]) ;then
     	get_listen_params