diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh
index 228be0b1598629..83ea7aab0e081c 100644
--- a/eng/common/native/init-distro-rid.sh
+++ b/eng/common/native/init-distro-rid.sh
@@ -20,10 +20,6 @@ getNonPortableDistroRid()
         # shellcheck disable=SC1091
         if [ -e "${rootfsDir}/etc/os-release" ]; then
             . "${rootfsDir}/etc/os-release"
-            if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then
-                VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
-            fi
-
             if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
                 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
             else
@@ -48,19 +44,7 @@ getNonPortableDistroRid()
         nonPortableRid="android.$__android_sdk_version-${targetArch}"
     elif [ "$targetOs" = "illumos" ]; then
         __uname_version=$(uname -v)
-        case "$__uname_version" in
-            omnios-*)
-                __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
-                nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
-                ;;
-            joyent_*)
-                __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
-                nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
-                ;;
-            *)
-                nonPortableRid="illumos-${targetArch}"
-                ;;
-        esac
+        nonPortableRid="illumos-${targetArch}"
     elif [ "$targetOs" = "solaris" ]; then
         __uname_version=$(uname -v)
         __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 32f99429ffd692..dbf8e0a7fcc1e4 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -498,7 +498,7 @@ extends:
           jobParameters:
             testScope: innerloop
             nameSuffix: CoreCLR_NonPortable
-            buildArgs: -s clr.native+clr.tools+clr.corelib+clr.nativecorelib+clr.aot+clr.packages -c $(_BuildConfig) /p:PortableBuild=false
+            buildArgs: -s clr.native+clr.tools+clr.corelib+clr.nativecorelib+clr.aot+clr.packages --outputrid tizen.9.0.0-armel -c $(_BuildConfig) /p:PortableBuild=false
             timeoutInMinutes: 120
             condition: >-
               or(