diff --git a/.cmake-format.yaml b/.cmake-format.yaml
new file mode 100644
index 00000000..543ddf19
--- /dev/null
+++ b/.cmake-format.yaml
@@ -0,0 +1,6 @@
+format:
+  line_width: 99
+
+# Causes a few issues - can be solved later, possibly.
+markup:
+  enable_markup: false
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f48801a6..b580f53e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,20 +1,26 @@
+ci:
+  autoupdate_commit_msg: "chore(deps): pre-commit.ci autoupdate"
+  skip:
+    - docker-clang-format
+
 
 repos:
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.6b0
   hooks:
   - id: black
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
   - id: check-added-large-files
-  - id: mixed-line-ending
-  - id: trailing-whitespace
-  - id: check-merge-conflict
   - id: check-case-conflict
+  - id: check-merge-conflict
   - id: check-symlinks
   - id: check-yaml
+  - id: end-of-file-fixer
+  - id: mixed-line-ending
+  - id: trailing-whitespace
 
 - repo: local
   hooks:
@@ -27,3 +33,9 @@ repos:
     args:
     - -style=file
     - -i
+
+- repo: https://github.com/cheshirekow/cmake-format-precommit
+  rev: v0.6.13
+  hooks:
+  - id: cmake-format
+    additional_dependencies: [pyyaml]
diff --git a/.pre-commit-nodocker.yaml b/.pre-commit-nodocker.yaml
deleted file mode 100644
index 5fcaf3e5..00000000
--- a/.pre-commit-nodocker.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-repos:
-- repo: https://github.com/psf/black
-  rev: 19.3b0
-  hooks:
-  - id: black
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
-  hooks:
-  - id: check-added-large-files
-  - id: mixed-line-ending
-  - id: trailing-whitespace
-  - id: check-merge-conflict
-  - id: check-case-conflict
-  - id: check-symlinks
-  - id: check-yaml
-- repo: local
-  hooks:
-  - id: clang-format
-    name: Clang Format
-    language: system
-    types:
-    - c++
-    entry: clang-format
-    args:
-    - -style=file
-    - -i