diff --git a/rocclr/runtime/device/gpu/gpudefs.hpp b/rocclr/runtime/device/gpu/gpudefs.hpp
index 3393f16bcf..83dff3629a 100644
--- a/rocclr/runtime/device/gpu/gpudefs.hpp
+++ b/rocclr/runtime/device/gpu/gpudefs.hpp
@@ -204,7 +204,7 @@ static const char* Gfx1000 = "AMD:AMDGPU:10:0:0";
 static const char* Gfx1001 = "AMD:AMDGPU:10:0:1";
 
 // Supported OpenCL versions
-enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20 };
+enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20, OpenCL21 };
 
 struct CalFormat {
   gslChannelOrder channelOrder_;  //!< Texel/pixel GSL channel order
diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index 2887ddb002..aaa86662e0 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -265,6 +265,9 @@ bool Settings::create(const CALdeviceattribs& calAttr, bool reportAsOCL12Device,
         libSelector_ = amd::GPU_Library_SI;
       }
 
+      // Cap at OpenCL20 for now
+      if (oclVersion_ > OpenCL20) oclVersion_ = OpenCL20;
+
       // This needs to be cleaned once 64bit addressing is stable
       if (oclVersion_ < OpenCL20) {
         use64BitPtr_ = flagIsDefault(GPU_FORCE_64BIT_PTR)
diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 4edcb9c2e9..c3b5467d62 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -202,7 +202,7 @@ static const char* Gfx1000  = "AMD:AMDGPU:10:0:0";
 static const char* Gfx1001  = "AMD:AMDGPU:10:0:1";
 
 // Supported OpenCL versions
-enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20 };
+enum OclVersion { OpenCL10, OpenCL11, OpenCL12, OpenCL20, OpenCL21 };
 
 struct MemoryFormat {
   cl_image_format clFormat_;        //!< CL image format
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index bfbf019c16..c340a3d4a7 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -248,6 +248,9 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
       }
       numComputeRings_ = 8;
 
+      // Cap at OpenCL20 for now
+      if (oclVersion_ > OpenCL20) oclVersion_ = OpenCL20;
+
       // This needs to be cleaned once 64bit addressing is stable
       if (oclVersion_ < OpenCL20) {
         use64BitPtr_ = flagIsDefault(GPU_FORCE_64BIT_PTR)