diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
index 6265229..117831e 100644
--- a/.github/workflows/hugo.yml
+++ b/.github/workflows/hugo.yml
@@ -36,12 +36,12 @@ jobs:
           HUGO_ENVIRONMENT: production
           TZ: America/New_York
         run: |
-          hugo --gc --minify -s ./docs
-          hugo --gc --minify -s ./k3s-cluster -d "$(pwd)/docs/public/k3s-cluster"
+          hugo --gc --minify -s ./docs --config ../config/hugo.yaml,hugo.yaml
+          hugo --gc --minify -s ./k3s-cluster --config ../config/hugo.yaml,hugo.yaml
       - name: Upload Pages Artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: ./docs/public
+          path: ./public
   deploy:
     name: Deploy to GitHub Pages
     environment:
diff --git a/config/hugo.yaml b/config/hugo.yaml
new file mode 100644
index 0000000..497029f
--- /dev/null
+++ b/config/hugo.yaml
@@ -0,0 +1,69 @@
+build:
+  buildStats:
+    disableIDs: true
+    enable: true
+defaultContentLanguage: en
+enableInlineShortcodes: true
+enableGitInfo: true
+enableRobotsTXT: true
+hasCJKLanguage: true
+languages:
+  en:
+    languageName: English
+    weight: 1
+markup:
+  goldmark:
+    renderer:
+      unsafe: true
+  highlight:
+    noClasses: false
+module:
+  hugoVersion:
+    extended: true
+    min: 0.125.0
+  imports:
+    - path: github.com/imfing/hextra
+outputs:
+  home: [HTML]
+  page: [HTML]
+  section: [HTML, RSS]
+params:
+  blog:
+    list:
+      displayTags: true
+  comments:
+    enable: false
+    giscus:
+      category: Discussions
+      categoryId: DIC_kwDOI0Z9Z84Cfhkt
+      emitMetadata: 0
+      inputPosition: bottom
+      lang: en
+      mapping: pathname
+      reactionsEnabled: 1
+      repo: axivo/website
+      repoId: R_kgDOI0Z9Zw
+      strict: 0
+    type: giscus
+  dateFormat: 'January 2, 2006'
+  displayUpdatedDate: true
+  footer:
+    displayCopyright: true
+    displayPoweredBy: false
+    enable: true
+    width: normal
+  navbar:
+    displayTitle: true
+    displayLogo: true
+    # logo:
+    #   path: /logo.svg
+    #   dark: /logo.svg
+    #   link: /
+    #   width: 20
+    #   height: 10
+    # width: wide
+  page:
+    width: normal
+  theme:
+    default: system
+    displayToggle: true
diff --git a/docs/hugo.yaml b/docs/hugo.yaml
index e815fab..f918418 100644
--- a/docs/hugo.yaml
+++ b/docs/hugo.yaml
@@ -1,24 +1,7 @@
 baseURL: https://axivo.com/
-build:
-  buildStats:
-    disableIDs: true
-    enable: true
-defaultContentLanguage: en
-enableInlineShortcodes: true
-enableGitInfo: true
-enableRobotsTXT: true
-hasCJKLanguage: true
 languages:
   en:
-    languageName: English
     title: AXIVO
-    weight: 1
-markup:
-  goldmark:
-    renderer:
-      unsafe: true
-  highlight:
-    noClasses: false
 menu:
   main:
     - name: Search
@@ -30,59 +13,11 @@ menu:
         icon: github
       url: https://github.com/axivo/website
       weight: 2
-module:
-  hugoVersion:
-    extended: true
-    min: 0.125.0
-  imports:
-    - path: github.com/imfing/hextra
-outputs:
-  home: [HTML]
-  page: [HTML]
-  section: [HTML, RSS]
 params:
-  blog:
-    list:
-      displayTags: true
-  comments:
-    enable: false
-    giscus:
-      category: Discussions
-      categoryId: DIC_kwDOI0Z9Z84Cfhkt
-      emitMetadata: 0
-      inputPosition: bottom
-      lang: en
-      mapping: pathname
-      reactionsEnabled: 1
-      repo: axivo/website
-      repoId: R_kgDOI0Z9Zw
-      strict: 0
-    type: giscus
-  dateFormat: 'January 2, 2006'
   description: Imagine. Create.
-  displayUpdatedDate: true
   editURL:
     base: https://github.com/axivo/website/edit/main/docs
     enable: true
-  footer:
-    displayCopyright: true
-    displayPoweredBy: false
-    enable: true
-    width: normal
-  navbar:
-    displayTitle: true
-    displayLogo: true
-    # logo:
-    #   path: /logo.svg
-    #   dark: /logo.svg
-    #   link: /
-    #   width: 20
-    #   height: 10
-    # width: wide
-  page:
-    width: normal
-  theme:
-    default: system
-    displayToggle: true
   variables:
     repository: github.com/axivo/website
+publishDir: ../public
diff --git a/k3s-cluster/hugo.yaml b/k3s-cluster/hugo.yaml
index bb310da..32f794a 100644
--- a/k3s-cluster/hugo.yaml
+++ b/k3s-cluster/hugo.yaml
@@ -1,24 +1,7 @@
 baseURL: https://axivo.com/k3s-cluster/
-build:
-  buildStats:
-    disableIDs: true
-    enable: true
-defaultContentLanguage: en
-enableInlineShortcodes: true
-enableGitInfo: true
-enableRobotsTXT: true
-hasCJKLanguage: true
 languages:
   en:
-    languageName: English
     title: 'AXIVO: K3s Cluster'
-    weight: 1
-markup:
-  goldmark:
-    renderer:
-      unsafe: true
-  highlight:
-    noClasses: false
 menu:
   main:
     - name: Documentation
@@ -57,62 +40,14 @@ menu:
       name: "🌐 Issues ↗"
       url: "https://github.com/axivo/k3s-cluster/issues"
       weight: 3
-module:
-  hugoVersion:
-    extended: true
-    min: 0.125.0
-  imports:
-    - path: github.com/imfing/hextra
-outputs:
-  home: [HTML]
-  page: [HTML]
-  section: [HTML, RSS]
 params:
-  blog:
-    list:
-      displayTags: true
-  comments:
-    enable: false
-    giscus:
-      category: Discussions
-      categoryId: DIC_kwDOI0Z9Z84Cfhkt
-      emitMetadata: 0
-      inputPosition: bottom
-      lang: en
-      mapping: pathname
-      reactionsEnabled: 1
-      repo: axivo/website
-      repoId: R_kgDOI0Z9Zw
-      strict: 0
-    type: giscus
-  dateFormat: 'January 2, 2006'
-  description: K3s cluster deployed with Ansible
-  displayUpdatedDate: true
+  description: High Availability K3s cluster deployed with Ansible
   editURL:
     base: https://github.com/axivo/website/edit/main/k3s-cluster/content
     enable: true
-  footer:
-    displayCopyright: true
-    displayPoweredBy: false
-    enable: true
-    width: normal
-  navbar:
-    displayTitle: true
-    displayLogo: true
-    # logo:
-    #   path: /logo.svg
-    #   dark: /logo.svg
-    #   link: /
-    #   width: 20
-    #   height: 10
-    # width: wide
-  page:
-    width: normal
-  theme:
-    default: system
-    displayToggle: true
   variables:
     os:
       previous_version: 22.04
       version: 24.04
     repository: github.com/axivo/k3s-cluster
+publishDir: ../public/k3s-cluster