diff --git a/.github/workflows/causal_lm_cpp.yml b/.github/workflows/causal_lm_cpp.yml
index f0336f0c0..6aaf7f073 100644
--- a/.github/workflows/causal_lm_cpp.yml
+++ b/.github/workflows/causal_lm_cpp.yml
@@ -19,6 +19,9 @@ env:
 jobs:
   cpp-multinomial-greedy_causal_lm-ubuntu:
     runs-on: ubuntu-20.04-8-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -62,6 +65,9 @@ jobs:
             python ./samples/python/beam_search_causal_lm/beam_search_causal_lm.py,
           ]
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -241,6 +247,9 @@ jobs:
 
   cpp-beam_search_causal_lm-Qwen-7B-Chat:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -268,6 +277,9 @@ jobs:
 
   cpp-beam_search_causal_lm-Qwen1_5-7B-Chat:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -296,6 +308,9 @@ jobs:
 
   cpp-beam_search_causal_lm-Phi-2:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -324,6 +339,9 @@ jobs:
 
   cpp-beam_search_causal_lm-notus-7b-v1:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -352,6 +370,9 @@ jobs:
 
   cpp-speculative_decoding_lm-ubuntu:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -389,6 +410,9 @@ jobs:
 
   cpp-prompt_lookup_decoding_lm-ubuntu:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -456,6 +480,9 @@ jobs:
 
   cpp-Phi-1_5:
     runs-on: ubuntu-20.04-16-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -504,6 +531,9 @@ jobs:
 
   cpp-greedy_causal_lm-redpajama-3b-chat:
     runs-on: ubuntu-20.04-4-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -554,6 +584,9 @@ jobs:
 
   cpp-chat_sample-ubuntu:
     runs-on: ubuntu-20.04
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -614,6 +647,9 @@ jobs:
 
   cpp-continuous-batching-ubuntu:
     runs-on: ubuntu-20.04-8-cores
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -697,6 +733,9 @@ jobs:
 
   cpp-continuous-batching-macos:
     runs-on: macos-12
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/src/cpp/src/tokenizers_path.cpp b/src/cpp/src/tokenizers_path.cpp
index ae37a4dda..d0cd82c26 100644
--- a/src/cpp/src/tokenizers_path.cpp
+++ b/src/cpp/src/tokenizers_path.cpp
@@ -57,7 +57,7 @@ std::string get_ov_genai_library_path() {
 }
 
 std::filesystem::path with_openvino_tokenizers(const std::filesystem::path& path) {
-#if defined(_DEBUG) && (defined(__APPLE__) || defined(_WIN32))
+#if !defined(NDEBUG) && (defined(__APPLE__) || defined(_WIN32))
 # define LIB_POSTFIX "d"
 #else
 # define LIB_POSTFIX ""
diff --git a/thirdparty/openvino_tokenizers b/thirdparty/openvino_tokenizers
index 145f3cf17..c990f9c46 160000
--- a/thirdparty/openvino_tokenizers
+++ b/thirdparty/openvino_tokenizers
@@ -1 +1 @@
-Subproject commit 145f3cf17a154fad8153761bf79656995323f56c
+Subproject commit c990f9c46dbaf4ea9e44240ff6f3df84181770f5