diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 31c5b7471b..0394b34936 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -38,7 +38,7 @@ components:
     dest_dir: kernels_bin
     type: git
     branch: kernels_bin
-    revision: 1982-408
+    revision: 1982-406
   kmdaf:
     branch: kmdaf
     dest_dir: kmdaf
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
index 1d7aebba01..bf6b07dea1 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -2597,7 +2597,7 @@ TEST(OfflineCompilerTest, givenOutputNoSuffixFlagAndNonEmptyOutputFileNameAndNon
 
     mockOfflineCompiler.writeOutAllFiles();
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("some_output_filename");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);
@@ -2613,7 +2613,7 @@ TEST(OfflineCompilerTest, givenInputFileNameAndOutputNoSuffixFlagAndEmptyOutputF
 
     mockOfflineCompiler.writeOutAllFiles();
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("important_file.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("important_file");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);
@@ -2637,7 +2637,7 @@ TEST(OfflineCompilerTest, givenNonEmptyOutputDirectoryWhenWritingOutAllFilesTheD
     EXPECT_EQ("/home/important", mockOfflineCompiler.createdDirs[1]);
     EXPECT_EQ("/home/important/compilation", mockOfflineCompiler.createdDirs[2]);
 
-    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("/home/important/compilation/some_output_filename.bin");
+    const auto outputFileIt = mockOfflineCompiler.uniqueHelper->interceptedFiles.find("/home/important/compilation/some_output_filename");
     ASSERT_NE(mockOfflineCompiler.uniqueHelper->interceptedFiles.end(), outputFileIt);
 
     EXPECT_EQ("12345678", outputFileIt->second);
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index f23139cd8a..c2462d2372 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -1178,7 +1178,7 @@ void OfflineCompiler::writeOutAllFiles() {
     if (!elfBinary.empty()) {
         std::string elfOutputFile;
         if (outputNoSuffix) {
-            elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin");
+            elfOutputFile = generateFilePath(outputDirectory, fileBase, "");
         } else {
             elfOutputFile = generateFilePath(outputDirectory, fileBase, ".bin") + generateOptsSuffix();
         }