diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 3ade1cb8..e6b551cb 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -96,8 +96,8 @@ jobs:
         source venv/bin/activate
         ${{matrix.architecture == '32' && 'export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:$PKG_CONFIG_PATH' || 'PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH'}}
         cmake -G Ninja -S ThunderClientLibraries -B ${{matrix.build_type}}/build/ThunderClientLibraries \
-        -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
-        -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
+        -DCMAKE_CXX_FLAGS="-m${{matrix.architecture}}" \
+        -DCMAKE_C_FLAGS="-m${{matrix.architecture}}" \
         -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
         -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
         -DBLUETOOTHAUDIOSINK=ON \
diff --git a/.github/workflows/MacOS build template.yml b/.github/workflows/MacOS build template.yml
index 69eb5992..def28327 100644
--- a/.github/workflows/MacOS build template.yml	
+++ b/.github/workflows/MacOS build template.yml	
@@ -59,11 +59,8 @@ jobs:
       run: |
         source venv/bin/activate
         cmake -G Ninja -S ThunderClientLibraries -B ${{matrix.build_type}}/build/ThunderClientLibraries \
-        -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
-        -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
         -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
         -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
-        -DCMAKE_CXX_STANDARD=11 \
         -DBLUETOOTHAUDIOSINK=ON \
         -DBLUETOOTHAUDIOSOURCE=ON \
         -DCDMI=ON \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e79b5de1..a17c888d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,24 +52,6 @@ if (BUILD_REFERENCE)
     add_definitions (-DBUILD_REFERENCE=${BUILD_REFERENCE})
 endif()
 
-if(ENABLE_STRICT_COMPILER_SETTINGS)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        message(FATAL_ERROR "Compiling with Clang")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "-Weverything -Wextra -Wpedantic -Werror")
-        set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
-    elseif(${CMAKE_COMPILER_IS_GNUCXX})
-        message(STATUS "Compiling with GCC")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "-Wall -Wextra -Wpedantic -Werror")
-        set(CMAKE_STRICT_CXX_COMPILER_SETTINGS "${CMAKE_STRICT_COMPILER_SETTINGS} -Wnon-virtual-dtor")
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-        message(STATUS "Compiling with MS Visual Studio")
-        set(CMAKE_STRICT_COMPILER_SETTINGS "/W4")
-    else()
-        message(STATUS "Compiler ${CMAKE_CXX_COMPILER_ID}")
-    endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_STRICT_CXX_COMPILER_SETTINGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_STRICT_COMPILER_SETTINGS}")
-endif()
 
 add_subdirectory(Source)
 add_subdirectory(Tests)