diff --git a/.editorconfig b/.editorconfig
index 62ca398ae0..833ace8faf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.toml]
+indent_size = 2
+
 [*.html]
 indent_size = 2
 
diff --git a/website/netlify.toml b/website/netlify.toml
index a85db7717e..8cc7eb4d4d 100644
--- a/website/netlify.toml
+++ b/website/netlify.toml
@@ -1,3 +1,11 @@
+[[plugins]]
+package = "netlify-plugin-cache"
+  [plugins.inputs]
+  paths = ["website/.docusaurus", "website/node_modules/.cache"]
+
+[[plugins]]
+package = "netlify-plugin-debug-cache"
+
 [[redirects]]
   from = "/blog/*"
   to = "https://goauthentik.io/blog/:splat"
diff --git a/website/package-lock.json b/website/package-lock.json
index a084af30a9..a7ddbe2c96 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -50,6 +50,7 @@
                 "cross-env": "^7.0.3",
                 "eslint": "^9.29.0",
                 "fast-glob": "^3.3.3",
+                "netlify-plugin-cache": "^1.0.3",
                 "npm-run-all": "^4.1.5",
                 "prettier": "^3.5.3",
                 "prettier-plugin-packagejson": "^2.5.15",
@@ -19236,6 +19237,13 @@
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
             "license": "MIT"
         },
+        "node_modules/netlify-plugin-cache": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/netlify-plugin-cache/-/netlify-plugin-cache-1.0.3.tgz",
+            "integrity": "sha512-CTOwNWrTOP59T6y6unxQNnp1WX702v2R/faR5peSH94ebrYfyY4zT5IsRcIiHKq57jXeyCrhy0GLuTN8ktzuQg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/nice-try": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
diff --git a/website/package.json b/website/package.json
index b154a2c369..2306c17c2e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -67,6 +67,7 @@
         "cross-env": "^7.0.3",
         "eslint": "^9.29.0",
         "fast-glob": "^3.3.3",
+        "netlify-plugin-cache": "^1.0.3",
         "npm-run-all": "^4.1.5",
         "prettier": "^3.5.3",
         "prettier-plugin-packagejson": "^2.5.15",