diff --git a/cmake/toolchains/iOS.cmake b/cmake/toolchains/iOS.cmake
index 43bc03bff..67bb7878d 100644
--- a/cmake/toolchains/iOS.cmake
+++ b/cmake/toolchains/iOS.cmake
@@ -251,7 +251,7 @@ set (CMAKE_OSX_ARCHITECTURES ${APPLE_ARCH} CACHE STRING  "Build architecture for
 if (VERACODE)
     set (APPLE_IOS_VERSION_MIN "10.0" CACHE STRING "Minimum supported Apple iOS version.")
 else ()
-    set (APPLE_IOS_VERSION_MIN "11.0" CACHE STRING "Minimum supported Apple iOS version.")
+    set (APPLE_IOS_VERSION_MIN "12.0" CACHE STRING "Minimum supported Apple iOS version.")
 endif ()
 set (APPLE_WATCH_VERSION_MIN "2.0" CACHE STRING "Minimum supported Apple Watch version.")
 set (APPLE_TV_VERSION_MIN "11.0" CACHE STRING "Minimum supported Apple TV version.")
diff --git a/olp-cpp-sdk-authentication/src/AuthenticationClient.cpp b/olp-cpp-sdk-authentication/src/AuthenticationClient.cpp
index fdcc517a7..3cc7afbbc 100644
--- a/olp-cpp-sdk-authentication/src/AuthenticationClient.cpp
+++ b/olp-cpp-sdk-authentication/src/AuthenticationClient.cpp
@@ -21,7 +21,7 @@
 
 #include <utility>
 
-#include "AuthenticationClientImpl.h"
+#include  "AuthenticationClientImpl.h"
 #include "olp/authentication/AuthorizeRequest.h"
 #include "olp/core/client/ApiError.h"
 #include "olp/core/client/CancellationToken.h"
diff --git a/olp-cpp-sdk-authentication/tests/AuthenticationClientTest.cpp b/olp-cpp-sdk-authentication/tests/AuthenticationClientTest.cpp
index bcec8173f..341d95448 100644
--- a/olp-cpp-sdk-authentication/tests/AuthenticationClientTest.cpp
+++ b/olp-cpp-sdk-authentication/tests/AuthenticationClientTest.cpp
@@ -23,7 +23,7 @@
 
 #include <gmock/gmock.h>
 
-#include "AuthenticationClientImpl.h"
+#include  "AuthenticationClientImpl.h"
 #include "AuthenticationClientUtils.h"
 #include "mocks/NetworkMock.h"
 
diff --git a/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm b/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm
index 9388eaafe..3dabdb100 100644
--- a/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm
+++ b/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm
@@ -19,6 +19,7 @@
 
 #import "OLPHttpClient+Internal.h"
 
+
 #import <CommonCrypto/CommonDigest.h>
 #import <Security/Security.h>
 
diff --git a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h
index 0879c28e8..93a0c2835 100644
--- a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h
+++ b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h
@@ -17,6 +17,7 @@
  * License-Filename: LICENSE
  */
 
+
 #pragma once
 
 #import <Foundation/Foundation.h>
diff --git a/scripts/misc/clang_format_ci.sh b/scripts/misc/clang_format_ci.sh
index 645e222c4..8372338b5 100755
--- a/scripts/misc/clang_format_ci.sh
+++ b/scripts/misc/clang_format_ci.sh
@@ -40,7 +40,7 @@ git fetch origin master
 git branch --all
 # Get affected files and filter source files
 FILES=$(git diff-tree --no-commit-id --name-only --diff-filter=d -r origin/master "$CURRENT_BRANCH" \
-        | grep '\.c\|\.cpp\|\.cxx\|\.h\|\.hpp\|\.hxx\|\.mm')
+        | grep '\.c\b\|\.cpp\b\|\.cxx\b\|\.h\b\|\.hpp\b\|\.hxx\b\|\.mm\b')
 
 if [ -z "$FILES" ]; then
   printf "No affected files, exiting.\n"