diff --git a/.gitignore b/.gitignore
index e24c0c5e9a19..9fafdb13cb7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -169,5 +169,5 @@ coverage.xml
 cmake_options.yml
 
 # header file generated at compile time
-include/mkldnn/oneapi/dnnl/dnnl_version.h
-include/mkldnn/oneapi/dnnl/dnnl_config.h
+include/mkldnn/dnnl_version.h
+include/mkldnn/dnnl_config.h
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index 83ebc40d86bc..2e4732679f02 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit 83ebc40d86bc54f0f23e947235e53570eeacf254
+Subproject commit 2e4732679f0211bb311780d0f383cf2dce9baca7
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e93e0b3876c..09ccf4410675 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -815,9 +815,9 @@ endif()
 if(USE_MKLDNN)
     add_custom_command(TARGET mxnet POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/oneapi/dnnl/dnnl_config.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/oneapi/dnnl/
+      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/dnnl_config.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/
       COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/oneapi/dnnl/dnnl_version.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/oneapi/dnnl/)
+      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/dnnl_version.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/)
 endif()
 
 if(USE_INTGEMM)
diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
index c3eb17a4e3cd..fe2e71c06667 100644
--- a/cd/mxnet_lib/static/Jenkins_pipeline.groovy
+++ b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
@@ -33,7 +33,7 @@ licenses = 'licenses/*'
 
 // libmxnet dependencies
 mx_native_deps = 'lib/libgfortran.so.3'
-mx_deps = 'lib/libgfortran.so.3, 3rdparty/mkldnn/build/install/include/oneapi/dnnl/dnnl_version.h, 3rdparty/mkldnn/build/install/include/oneapi/dnnl/dnnl_config.h'
+mx_deps = 'lib/libgfortran.so.3, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h'
 
 // library type
 // either static or dynamic - depending on how it links to its dependencies
diff --git a/cd/python/pypi/pypi_package.sh b/cd/python/pypi/pypi_package.sh
index 998b0c16a1dc..1e8103bdfca7 100755
--- a/cd/python/pypi/pypi_package.sh
+++ b/cd/python/pypi/pypi_package.sh
@@ -28,9 +28,9 @@ export mxnet_variant=${1:?"Please specify the mxnet variant"}
 # and CD unpacks it to a directory called cd_misc
 # Nov. 2019 Update: With v1.1, MKL-DNN is renaming to DNNL. Hence changing the prefix of file name.
 if [ -f "cd_misc/dnnl_version.h" ]; then
-  mkdir -p 3rdparty/mkldnn/include/oneapi/dnnl
-  cp cd_misc/dnnl_version.h 3rdparty/mkldnn/include/oneapi/dnnl/.
-  cp cd_misc/dnnl_config.h 3rdparty/mkldnn/include/oneapi/dnnl/.
+  mkdir -p 3rdparty/mkldnn/include
+  cp cd_misc/dnnl_version.h 3rdparty/mkldnn/include/.
+  cp cd_misc/dnnl_config.h 3rdparty/mkldnn/include/.
 fi
 
 # Create wheel workspace
diff --git a/include/mkldnn/dnnl_config.h b/include/mkldnn/dnnl_config.h
deleted file mode 120000
index ff3719dfc04c..000000000000
--- a/include/mkldnn/dnnl_config.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_config.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_debug.h b/include/mkldnn/dnnl_debug.h
deleted file mode 120000
index db549eddc337..000000000000
--- a/include/mkldnn/dnnl_debug.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_debug.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_ocl.h b/include/mkldnn/dnnl_ocl.h
deleted file mode 120000
index ecc7f34288a4..000000000000
--- a/include/mkldnn/dnnl_ocl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_ocl.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_ocl.hpp b/include/mkldnn/dnnl_ocl.hpp
deleted file mode 120000
index 3f4fec4277cc..000000000000
--- a/include/mkldnn/dnnl_ocl.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_ocl.hpp
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_sycl.h b/include/mkldnn/dnnl_sycl.h
deleted file mode 120000
index 4c1bfe51acf1..000000000000
--- a/include/mkldnn/dnnl_sycl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_sycl.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_sycl.hpp b/include/mkldnn/dnnl_sycl.hpp
deleted file mode 120000
index 8837231daae0..000000000000
--- a/include/mkldnn/dnnl_sycl.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_sycl.hpp
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_sycl_types.h b/include/mkldnn/dnnl_sycl_types.h
deleted file mode 120000
index 94461bc3d449..000000000000
--- a/include/mkldnn/dnnl_sycl_types.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_sycl_types.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_threadpool.h b/include/mkldnn/dnnl_threadpool.h
deleted file mode 120000
index 5ed7f6431e3d..000000000000
--- a/include/mkldnn/dnnl_threadpool.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_threadpool.h
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_threadpool.hpp b/include/mkldnn/dnnl_threadpool.hpp
deleted file mode 120000
index dff43b044767..000000000000
--- a/include/mkldnn/dnnl_threadpool.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_threadpool.hpp
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_threadpool_iface.hpp b/include/mkldnn/dnnl_threadpool_iface.hpp
deleted file mode 120000
index f651ff17f10a..000000000000
--- a/include/mkldnn/dnnl_threadpool_iface.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_threadpool_iface.hpp
\ No newline at end of file
diff --git a/include/mkldnn/dnnl_version.h b/include/mkldnn/dnnl_version.h
deleted file mode 120000
index a4fde025b179..000000000000
--- a/include/mkldnn/dnnl_version.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/dnnl_version.h
\ No newline at end of file
diff --git a/include/mkldnn/mkldnn_config.h b/include/mkldnn/mkldnn_config.h
deleted file mode 120000
index 8f5259e54d1a..000000000000
--- a/include/mkldnn/mkldnn_config.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/mkldnn_config.h
\ No newline at end of file
diff --git a/include/mkldnn/mkldnn_debug.h b/include/mkldnn/mkldnn_debug.h
deleted file mode 120000
index a67617c2942a..000000000000
--- a/include/mkldnn/mkldnn_debug.h
+++ /dev/null
@@ -1 +0,0 @@
-../../3rdparty/mkldnn/include/mkldnn_debug.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl.h b/include/mkldnn/oneapi/dnnl/dnnl.h
deleted file mode 120000
index ee11f505f1d2..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl.hpp b/include/mkldnn/oneapi/dnnl/dnnl.hpp
deleted file mode 120000
index 22635d614bd3..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl.hpp
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_debug.h b/include/mkldnn/oneapi/dnnl/dnnl_debug.h
deleted file mode 120000
index 982bc2191721..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_debug.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_debug.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_ocl.h b/include/mkldnn/oneapi/dnnl/dnnl_ocl.h
deleted file mode 120000
index 85970c1e1f0e..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_ocl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_ocl.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_ocl.hpp b/include/mkldnn/oneapi/dnnl/dnnl_ocl.hpp
deleted file mode 120000
index 4fcef2ca93b9..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_ocl.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_ocl.hpp
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl.h b/include/mkldnn/oneapi/dnnl/dnnl_sycl.h
deleted file mode 120000
index e39828aeacbb..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_sycl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl.hpp b/include/mkldnn/oneapi/dnnl/dnnl_sycl.hpp
deleted file mode 120000
index 240f3ce94535..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_sycl.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl.hpp
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl_types.h b/include/mkldnn/oneapi/dnnl/dnnl_sycl_types.h
deleted file mode 120000
index 57e21d047c23..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_sycl_types.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl_types.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.h b/include/mkldnn/oneapi/dnnl/dnnl_threadpool.h
deleted file mode 120000
index 025a0d37e4a6..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool.h
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.hpp b/include/mkldnn/oneapi/dnnl/dnnl_threadpool.hpp
deleted file mode 120000
index f0d9325da1c8..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool.hpp
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool_iface.hpp b/include/mkldnn/oneapi/dnnl/dnnl_threadpool_iface.hpp
deleted file mode 120000
index e650ecba6eae..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_threadpool_iface.hpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool_iface.hpp
\ No newline at end of file
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_types.h b/include/mkldnn/oneapi/dnnl/dnnl_types.h
deleted file mode 120000
index 88baa15cb5d5..000000000000
--- a/include/mkldnn/oneapi/dnnl/dnnl_types.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_types.h
\ No newline at end of file
diff --git a/mkldnn.mk b/mkldnn.mk
index 6f51c8f6a622..a22a64a018a8 100644
--- a/mkldnn.mk
+++ b/mkldnn.mk
@@ -50,13 +50,13 @@ $(MKLDNN_LIBFILE):
 	cmake $(MKLDNN_SUBMODDIR) $(mkldnn_FLAGS)
 	$(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1
 	$(MAKE) -C $(MKLDNN_BUILDDIR) install
-	cp $(MKLDNN_BUILDDIR)/include/oneapi/dnnl/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/oneapi/dnnl/.
-	cp $(MKLDNN_BUILDDIR)/include/oneapi/dnnl/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/oneapi/dnnl/.
+	cp $(MKLDNN_BUILDDIR)/include/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/.
+	cp $(MKLDNN_BUILDDIR)/include/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/.
 
 mkldnn_clean:
 	$(RM) -r 3rdparty/mkldnn/build
-	$(RM) -r include/mkldnn/oneapi/dnnl/dnnl_version.h
-	$(RM) -r include/mkldnn/oneapi/dnnl/dnnl_config.h
+	$(RM) -r include/mkldnn/dnnl_version.h
+	$(RM) -r include/mkldnn/dnnl_config.h
 
 ifeq ($(USE_MKLDNN), 1)
 mkldnn: mkldnn_build