diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 78cb5caf..97c3d1b0 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache@v4
         id: cache-homebrew-packages
         with:
-          key: homebrew-${{ runner.os }}-${{ steps.setup-homebrew.outputs.gems-hash }}-${{ hashFiles('.taskfiles/Workstation/Brewfile') }}
+          key: homebrew-${{ runner.os }}-${{ steps.setup-homebrew.outputs.gems-hash }}-${{ hashFiles('.taskfiles/workstation/Brewfile') }}
           path: /home/linuxbrew/.linuxbrew
 
       - name: Cache venv
diff --git a/.taskfiles/Bootstrap/Taskfile.yaml b/.taskfiles/bootstrap/Taskfile.yaml
similarity index 100%
rename from .taskfiles/Bootstrap/Taskfile.yaml
rename to .taskfiles/bootstrap/Taskfile.yaml
diff --git a/.taskfiles/Kubernetes/Taskfile.yaml b/.taskfiles/kubernetes/Taskfile.yaml
similarity index 100%
rename from .taskfiles/Kubernetes/Taskfile.yaml
rename to .taskfiles/kubernetes/Taskfile.yaml
diff --git a/.taskfiles/Talos/Taskfile.yaml b/.taskfiles/talos/Taskfile.yaml
similarity index 100%
rename from .taskfiles/Talos/Taskfile.yaml
rename to .taskfiles/talos/Taskfile.yaml
diff --git a/.taskfiles/Workstation/Archfile b/.taskfiles/workstation/Archfile
similarity index 100%
rename from .taskfiles/Workstation/Archfile
rename to .taskfiles/workstation/Archfile
diff --git a/.taskfiles/Workstation/Brewfile b/.taskfiles/workstation/Brewfile
similarity index 100%
rename from .taskfiles/Workstation/Brewfile
rename to .taskfiles/workstation/Brewfile
diff --git a/.taskfiles/Workstation/Taskfile.yaml b/.taskfiles/workstation/Taskfile.yaml
similarity index 88%
rename from .taskfiles/Workstation/Taskfile.yaml
rename to .taskfiles/workstation/Taskfile.yaml
index fe38064b..666c182a 100644
--- a/.taskfiles/Workstation/Taskfile.yaml
+++ b/.taskfiles/workstation/Taskfile.yaml
@@ -6,7 +6,7 @@ tasks:
 
   arch:
     desc: Set up Arch Linux tools
-    cmd: '{{.PKGMGR}} -Syu --needed --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/Workstation/Archfile | xargs)'
+    cmd: '{{.PKGMGR}} -Syu --needed --noconfirm --noprogressbar $(cat {{.ROOT_DIR}}/.taskfiles/workstation/Archfile | xargs)'
     vars:
       PKGMGR:
         sh: command -v yay || command -v paru
@@ -14,21 +14,21 @@ tasks:
       - msg: Missing yay or paru
         sh: command -v brew &>/dev/null || command -v paru &>/dev/null
       - msg: Missing Archfile
-        sh: test -f {{.ROOT_DIR}}/.taskfiles/Workstation/Archfile
+        sh: test -f {{.ROOT_DIR}}/.taskfiles/workstation/Archfile
 
   brew:
     desc: Set up Homebrew tools
     cmds:
-      - brew bundle --file {{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile
+      - brew bundle --file {{.ROOT_DIR}}/.taskfiles/workstation/Brewfile
     sources:
-      - '{{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile'
+      - '{{.ROOT_DIR}}/.taskfiles/workstation/Brewfile'
     generates:
-      - '{{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile.lock.json'
+      - '{{.ROOT_DIR}}/.taskfiles/workstation/Brewfile.lock.json'
     preconditions:
       - msg: Missing brew
         sh: command -v brew &>/dev/null
       - msg: Missing Brewfile
-        sh: test -f {{.ROOT_DIR}}/.taskfiles/Workstation/Brewfile
+        sh: test -f {{.ROOT_DIR}}/.taskfiles/workstation/Brewfile
 
   direnv:
     desc: Run direnv hooks
diff --git a/README.md b/README.md
index 5430f147..f2195c88 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ You have two different options for setting up your local workstation.
 
 3. Install the additional **required** CLI tools
 
-   📍 _**Not using Homebrew or ArchLinux?** Try using the generic Linux task below, if that fails check out the [Brewfile](.taskfiles/Workstation/Brewfile)/[Archfile](.taskfiles/Workstation/Archfile) for what CLI tools needed and install them._
+   📍 _**Not using Homebrew or ArchLinux?** Try using the generic Linux task below, if that fails check out the [Brewfile](.taskfiles/workstation/Brewfile)/[Archfile](.taskfiles/workstation/Archfile) for what CLI tools needed and install them._
 
     ```sh
     # Homebrew
diff --git a/Taskfile.yaml b/Taskfile.yaml
index a090cc96..d59e699b 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -17,10 +17,10 @@ env:
   VIRTUAL_ENV: '{{.ROOT_DIR}}/.venv'
 
 includes:
-  bootstrap: .taskfiles/Bootstrap
-  kubernetes: .taskfiles/Kubernetes
-  talos: .taskfiles/Talos
-  workstation: .taskfiles/Workstation
+  bootstrap: .taskfiles/bootstrap
+  kubernetes: .taskfiles/kubernetes
+  talos: .taskfiles/talos
+  workstation: .taskfiles/workstation
   user:
     taskfile: .taskfiles/User
     optional: true
@@ -33,9 +33,9 @@ tasks:
     desc: Initialize configuration files
     cmds:
       - cp -n {{.BOOTSTRAP_CONFIG_FILE | replace ".yaml" ".sample.yaml"}} {{.BOOTSTRAP_CONFIG_FILE}}
-      - cmd: echo === Configuration file copied ===
-      - cmd: echo Proceed with updating the configuration files...
-      - cmd: echo {{.BOOTSTRAP_CONFIG_FILE}}
+      - echo "=== Configuration file copied ==="
+      - echo "Proceed with updating the configuration files..."
+      - echo "{{.BOOTSTRAP_CONFIG_FILE}}"
     status:
       - test -f {{.BOOTSTRAP_CONFIG_FILE}}
     silent: true
@@ -66,9 +66,9 @@ tasks:
     internal: true
     cmds:
       - task: kubernetes:kubeconform
-      - cmd: echo === Done rendering and validating YAML ===
-      - cmd: |
-          if test -f ~/.config/sops/age/keys.txt; then
-            echo WARNING: SOPS Age key found in home directory, this may cause conflicts.
-          fi
+      - echo "=== Done rendering and validating YAML ==="
+      - '{{if eq .HOME_SOPS_AGE_KEY_FILE_EXISTS "true"}}echo "WARNING: SOPS Age key found in home directory, this may cause conflicts."{{end}}'
+    vars:
+      HOME_SOPS_AGE_KEY_FILE_EXISTS:
+        sh: test -f ~/.config/sops/age/keys.txt && echo true || echo false
     silent: true