diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt
index c6dcf946ca..3fc55c0f7f 100755
--- a/rocrtst/suites/test_common/CMakeLists.txt
+++ b/rocrtst/suites/test_common/CMakeLists.txt
@@ -49,7 +49,7 @@ set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCR-R
 set ( CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/RadeonOpenCompute/ROCR-Runtime" )
 
 
-set(DEFAULT_TARGETS "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810;gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036")
+set(DEFAULT_TARGETS "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810;gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035")
 
 #
 # Currently support for Windows platform is not present
diff --git a/runtime/hsa-runtime/core/runtime/isa.cpp b/runtime/hsa-runtime/core/runtime/isa.cpp
index af34f45a15..e9a48f378e 100755
--- a/runtime/hsa-runtime/core/runtime/isa.cpp
+++ b/runtime/hsa-runtime/core/runtime/isa.cpp
@@ -314,7 +314,6 @@ constexpr size_t hsa_name_size = 63;
   ISAREG_ENTRY_GEN("gfx1033",                10, 3, 3, unsupported, unsupported)
   ISAREG_ENTRY_GEN("gfx1034",                10, 3, 4, unsupported, unsupported)
   ISAREG_ENTRY_GEN("gfx1035",                10, 3, 5, unsupported, unsupported)
-  ISAREG_ENTRY_GEN("gfx1036",                10, 3, 6, unsupported, unsupported)
 #undef ISAREG_ENTRY_GEN
   return supported_isas;
 }
diff --git a/runtime/hsa-runtime/image/blit_kernel.cpp b/runtime/hsa-runtime/image/blit_kernel.cpp
index a5b43784e4..4737b7cb69 100644
--- a/runtime/hsa-runtime/image/blit_kernel.cpp
+++ b/runtime/hsa-runtime/image/blit_kernel.cpp
@@ -95,7 +95,6 @@ extern uint8_t ocl_blit_object_gfx1032[];
 extern uint8_t ocl_blit_object_gfx1033[];
 extern uint8_t ocl_blit_object_gfx1034[];
 extern uint8_t ocl_blit_object_gfx1035[];
-extern uint8_t ocl_blit_object_gfx1036[];
 
 // Arguments inserted by OCL compiler, all zero here.
 struct OCLHiddenArgs {
@@ -1023,8 +1022,6 @@ hsa_status_t BlitKernel::GetPatchedBlitObject(const char* agent_name,
     *blit_code_object = ocl_blit_object_gfx1034;
   } else if (sname == "gfx1035") {
     *blit_code_object = ocl_blit_object_gfx1035;
-  } else if (sname == "gfx1036") {
-    *blit_code_object = ocl_blit_object_gfx1036;
   } else {
     return HSA_STATUS_ERROR_INVALID_ISA_NAME;
   }
diff --git a/runtime/hsa-runtime/image/blit_src/CMakeLists.txt b/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
index 710c0b4746..068995282a 100644
--- a/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
+++ b/runtime/hsa-runtime/image/blit_src/CMakeLists.txt
@@ -74,7 +74,7 @@ endif()
 
 # Determine the target devices if not specified
 if (NOT DEFINED TARGET_DEVICES)
-  set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810;gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036")
+  set (TARGET_DEVICES "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810;gfx900;gfx902;gfx904;gfx906;gfx908;gfx909;gfx90a;gfx90c;gfx1010;gfx1011;gfx1012;gfx1013;gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035")
 endif()
 set( TARGET_DEVICES ${TARGET_DEVICES} CACHE STRING "Build targets" FORCE )
 
diff --git a/runtime/hsa-runtime/image/device_info.cpp b/runtime/hsa-runtime/image/device_info.cpp
index ac551ac5bf..05358582c9 100755
--- a/runtime/hsa-runtime/image/device_info.cpp
+++ b/runtime/hsa-runtime/image/device_info.cpp
@@ -188,7 +188,6 @@ uint32_t DevIDToAddrLibFamily(uint32_t dev_id) {
               case 3:
               case 4:
               case 5:
-              case 6:
                 return FAMILY_NV;
 
               default:
diff --git a/runtime/hsa-runtime/inc/amd_hsa_elf.h b/runtime/hsa-runtime/inc/amd_hsa_elf.h
index 2f65e63034..ec5229e024 100644
--- a/runtime/hsa-runtime/inc/amd_hsa_elf.h
+++ b/runtime/hsa-runtime/inc/amd_hsa_elf.h
@@ -121,11 +121,10 @@ enum : unsigned {
   EF_AMDGPU_MACH_AMDGCN_RESERVED_0X40 = 0x040,
   EF_AMDGPU_MACH_AMDGCN_RESERVED_0X41 = 0x041,
   EF_AMDGPU_MACH_AMDGCN_GFX1013       = 0x042,
-  EF_AMDGPU_MACH_AMDGCN_GFX1036       = 0x045,
 
   // First/last AMDGCN-based processors.
   EF_AMDGPU_MACH_AMDGCN_FIRST = EF_AMDGPU_MACH_AMDGCN_GFX600,
-  EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_GFX1036,
+  EF_AMDGPU_MACH_AMDGCN_LAST = EF_AMDGPU_MACH_AMDGCN_GFX1013,
 
   // Indicates if the "xnack" target feature is enabled for all code contained
   // in the object.
diff --git a/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp b/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
index 1459ecd08b..2a3391b2aa 100644
--- a/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
+++ b/runtime/hsa-runtime/libamdhsacode/amd_hsa_code.cpp
@@ -580,7 +580,6 @@ namespace code {
       case ELF::EF_AMDGPU_MACH_AMDGCN_GFX1033: name = "gfx1033"; xnack_supported = false; sramecc_supported = false; break;
       case ELF::EF_AMDGPU_MACH_AMDGCN_GFX1034: name = "gfx1034"; xnack_supported = false; sramecc_supported = false; break;
       case ELF::EF_AMDGPU_MACH_AMDGCN_GFX1035: name = "gfx1035"; xnack_supported = false; sramecc_supported = false; break;
-      case ELF::EF_AMDGPU_MACH_AMDGCN_GFX1036: name = "gfx1036"; xnack_supported = false; sramecc_supported = false; break;
       default: return false;
       }
       return true;