diff --git a/build_debian.sh b/build_debian.sh
index 62de5a8218..c509b70971 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -492,6 +492,7 @@ export build_version="${SONIC_IMAGE_VERSION}"
 export debian_version="$(cat $FILESYSTEM_ROOT/etc/debian_version)"
 export kernel_version="${kversion}"
 export asic_type="${sonic_asic_platform}"
+export asic_subtype="${TARGET_MACHINE}"
 export commit_id="$(git rev-parse --short HEAD)"
 export branch="$(git rev-parse --abbrev-ref HEAD)"
 export release="$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $FILESYSTEM_ROOT/etc/sonic/sonic_release; fi)"
diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
index aaa047a420..7585e4896c 100755
--- a/dockers/docker-orchagent/orchagent.sh
+++ b/dockers/docker-orchagent/orchagent.sh
@@ -5,6 +5,7 @@ SWSS_VARS_FILE=/usr/share/sonic/templates/swss_vars.j2
 # Retrieve SWSS vars from sonic-cfggen
 SWSS_VARS=$(sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t $SWSS_VARS_FILE) || exit 1
 export platform=$(echo $SWSS_VARS | jq -r '.asic_type')
+export sub_platform=$(echo $SWSS_VARS | jq -r '.asic_subtype')
 
 MAC_ADDRESS=$(echo $SWSS_VARS | jq -r '.mac')
 if [ "$MAC_ADDRESS" == "None" ] || [ -z "$MAC_ADDRESS" ]; then
diff --git a/files/build_templates/sonic_version.yml.j2 b/files/build_templates/sonic_version.yml.j2
index 34486061ea..6e3f3acac9 100644
--- a/files/build_templates/sonic_version.yml.j2
+++ b/files/build_templates/sonic_version.yml.j2
@@ -7,6 +7,9 @@ debian_version: '{{ debian_version }}'
 kernel_version: '{{ kernel_version }}'
 {% endif -%}
 asic_type: {{ asic_type }}
+{% if asic_subtype is defined and asic_subtype != '' -%}
+asic_subtype: '{{ asic_subtype }}'
+{% endif -%}
 commit_id: '{{ commit_id }}'
 branch: '{{ branch }}'
 {% if release is defined and release != '' -%}
diff --git a/files/build_templates/swss_vars.j2 b/files/build_templates/swss_vars.j2
index df5e4d038f..1cd95d16a6 100644
--- a/files/build_templates/swss_vars.j2
+++ b/files/build_templates/swss_vars.j2
@@ -1,5 +1,8 @@
 {
     "asic_type": "{{ asic_type }}",
+    {% if asic_subtype is defined and asic_subtype != '' -%}
+    "asic_subtype": "{{ asic_subtype }}",
+    {% endif -%}
     "asic_id": "{{ DEVICE_METADATA.localhost.asic_id }}",
     "mac": "{{ DEVICE_METADATA.localhost.mac }}",
     "resource_type": "{{ DEVICE_METADATA.localhost.resource_type }}",