diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..f4733e1f
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,35 @@
+Language: Cpp
+AccessModifierOffset: 0
+AlignConsecutiveMacros: true
+BreakBeforeBraces: Linux
+IndentWidth: 2
+ConstructorInitializerIndentWidth: 2
+ColumnLimit: 0
+AlignAfterOpenBracket: Align
+Standard: c++11
+IndentAccessModifiers: true
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentGotoLabels: true
+IndentExternBlock: Indent
+UseTab: Never
+ReflowComments: true
+QualifierAlignment: Left
+ReferenceAlignment: Pointer
+PointerAlignment: Left
+InsertBraces: true
+NamespaceIndentation: All
+LineEnding: LF
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+AllowShortFunctionsOnASingleLine: None
+AllowAllArgumentsOnNextLine: false
+IncludeBlocks: Regroup
+IncludeCategories:
+    - Regex: '^<(resolve|tests)/'
+      Priority: 1
+    - Regex: '^<[[:alnum:].]+>'
+      Priority: -1
+    - Regex: '.*'
+      Priority: 0
diff --git a/.github/workflows/.clang-format b/.github/workflows/.clang-format
deleted file mode 100644
index b8cef3e9..00000000
--- a/.github/workflows/.clang-format
+++ /dev/null
@@ -1,9 +0,0 @@
-# Documentation about the style options and their meaning
-# https://releases.llvm.org/12.0.0/tools/clang/docs/ClangFormatStyleOptions.html 
-
-Language:        Cpp
-AccessModifierOffset: 0
-AlignConsecutiveMacros: true
-BreakBeforeBraces: Linux
-ColumnLimit:     150
-ConstructorInitializerIndentWidth: 2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c6d6bb5..41f2b8ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,10 +53,6 @@ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 # Add CMake sources from `cmake` dir
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-# Including clang-format cmake files to do automatic checking of formating
-# TODO: Set up clang-format
-#include(./cmake/clang-format)
-
 # This will create target `doxygen` for building documentation locally.
 # For now, this target is intended only for developers who want to test
 # different documentation configurations. To have Doxygen configuration
@@ -153,7 +149,7 @@ configure_package_config_file(./cmake/ReSolveConfig.cmake.in
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ReSolveConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/ReSolveConfigVersion.cmake"
         DESTINATION share/resolve/cmake)
-    
+
 # Add usage examples
 add_subdirectory(examples)