diff --git a/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index f7d80a42..05cff464 100644
--- a/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -20,7 +20,7 @@
 {{- $tabbyConfigId := (default "" (env "TABBY_CONFIG_ID")) -}}
 {{- $tabbySyncToken := (default "" (env "TABBY_SYNC_TOKEN")) -}}
 {{- $timezone := (default "America/New_York" (env "TIMEZONE")) -}}
-{{- $toolchains := list "docker" "go" "java" "kubernetes" "python" "rust" "extras" "web" "gpg" -}}
+{{- $toolchains := list "CLI-Extras" "Docker" "Go" "Kubernetes" "Web-Development" -}}
 {{- $desktopSession := true -}}
 {{- if and (ne .chezmoi.os "darwin") (ne .chezmoi.os "windows") (not (env "DISPLAY")) -}}
 {{-   $desktopSession = false -}}
@@ -95,30 +95,64 @@
 
 {{- range $toolchain := $toolchains }}
     {{- $enabled := promptBoolOnce $data.toolchains $toolchain (list "Enable" $toolchain "toolchain" | join " ") (get $toolchainsEnabled $toolchain) -}}
-    {{- if and (eq $toolchain "kubernetes") $enabled (not $toolchainsEnabled.docker)  -}}
-    {{- $_ := set $toolchainsEnabled "docker" $enabled }}
+    {{- if and (eq $toolchain "Kubernetes") $enabled (not $toolchainsEnabled.docker)  -}}
+    {{- $_ := set $toolchainsEnabled "Docker" $enabled }}
     {{-   writeToStdout "Enabled Docker toolchain to support Kubernetes.\n" -}}
     {{- end -}}
     {{- $_ := set $toolchainsEnabled $toolchain $enabled }}
 {{- end }}
 
-{{- $work = promptBoolOnce $data.host "work" "Work environment" $work -}}
-{{- $restricted = promptBoolOnce $data.host "restricted" "Restricted environment (i.e. no sudo)" $restricted -}}
-{{- $softwareGroup = promptStringOnce $data.host "softwareGroup" "Software group" $softwareGroup -}}
-{{- $name = promptStringOnce $data.user "name" "Full name" $name -}}
-{{- $email = promptStringOnce $data.user "email" "Primary e-mail address" $email -}}
-{{- $gpgKeyId = promptStringOnce $data.user "gpgKeyId" "Public GPG key ID" $gpgKeyId -}}
-{{- $domain = promptStringOnce $data.user "domain" "Domain name" $domain -}}
-{{- $timezone = promptStringOnce $data.user "timezone" "Timezone" $timezone -}}
-{{- $cloudflareToken = promptStringOnce $data.user "cloudflareToken" "CloudFlare API Token" $cloudflareToken -}}
-{{- $githubUsername = promptStringOnce $data.user "githubUsername" "GitHub username" $githubUsername -}}
-{{- $gitlabReadToken = promptStringOnce $data.user "gitlabReadToken" "GitLab read-only token" $gitlabReadToken }}
-{{- $githubReadToken = promptStringOnce $data.user "githubReadToken" "GitHub read-only token" $githubReadToken }}
-{{- $gmailAddress = promptStringOnce $data.user "gmailAddress" "G-mail address" $gmailAddress -}}
-{{- $gmailAddressAppPassword = promptStringOnce $data.user "gmailAddressAppPassword" "G-mail app password" $gmailAddressAppPassword -}}
-{{- $ngrokAuthToken = promptStringOnce $data.user "ngrokAuthToken" "Ngrok authentication token" $ngrokAuthToken -}}
-{{- $slackApiToken = promptStringOnce $data.user "slackApiToken" "Slack API token" $slackApiToken -}}
-{{- $tabbyConfigId = promptStringOnce $data.user "tabbyConfigId" "Tabby configuration ID" $tabbyConfigId -}}
+{{- if not (env "WORK_ENVIRONMENT") -}}
+{{-   $work = promptBoolOnce $data.host "work" "Work environment" $work -}}
+{{- end -}}
+{{- if not (env "RESTRICTED_ENVIRONMENT") -}}
+{{-   $restricted = promptBoolOnce $data.host "restricted" "Restricted environment (i.e. no sudo)" $restricted -}}
+{{- end -}}
+{{- if not (env "SOFTWARE_GROUP") -}}
+{{-   $softwareGroup = promptStringOnce $data.host "softwareGroup" "Software group" $softwareGroup -}}
+{{- end -}}
+{{- if not (env "FULL_NAME") -}}
+{{-   $name = promptStringOnce $data.user "name" "Full name" $name -}}
+{{- end -}}
+{{- if not (env "PRIMARY_EMAIL") -}}
+{{-   $email = promptStringOnce $data.user "email" "Primary e-mail address" $email -}}
+{{- end -}}
+{{- if not (env "KEYID") -}}
+{{-   $gpgKeyId = promptStringOnce $data.user "gpgKeyId" "Public GPG key ID" $gpgKeyId -}}
+{{- end -}}
+{{- if not (env "PUBLIC_SERVICES_DOMAIN") -}}
+{{-   $domain = promptStringOnce $data.user "domain" "Domain name" $domain -}}
+{{- end -}}
+{{- if not (env "TIMEZONE")) -}}
+{{-   $timezone = promptStringOnce $data.user "timezone" "Timezone" $timezone -}}
+{{- end -}}
+{{- if not (env "CLOUDFLARE_TOKEN")) -}}
+{{-   $cloudflareToken = promptStringOnce $data.user "cloudflareToken" "CloudFlare API Token" $cloudflareToken -}}
+{{- end -}}
+{{- if not (env "GITHUB_USERNAME")) -}}
+{{-   $githubUsername = promptStringOnce $data.user "githubUsername" "GitHub username" $githubUsername -}}
+{{- end -}}
+{{- if not (env "GITLAB_READ_TOKEN")) -}}
+{{-   $gitlabReadToken = promptStringOnce $data.user "gitlabReadToken" "GitLab read-only token" $gitlabReadToken }}
+{{- end -}}
+{{- if not (env "GITHUB_READ_TOKEN")) -}}
+{{-   $githubReadToken = promptStringOnce $data.user "githubReadToken" "GitHub read-only token" $githubReadToken }}
+{{- end -}}
+{{- if not (env "GMAIL_ADDRESS")) -}}
+{{-   $gmailAddress = promptStringOnce $data.user "gmailAddress" "G-mail address" $gmailAddress -}}
+{{- end -}}
+{{- if not (env "GMAIL_APP_PASSWORD")) -}}
+{{-   $gmailAddressAppPassword = promptStringOnce $data.user "gmailAddressAppPassword" "G-mail app password" $gmailAddressAppPassword -}}
+{{- end -}}
+{{- if not (env "NGROK_AUTH_TOKEN")) -}}
+{{-   $ngrokAuthToken = promptStringOnce $data.user "ngrokAuthToken" "Ngrok authentication token" $ngrokAuthToken -}}
+{{- end -}}
+{{- if not (env "SLACK_API_TOKEN")) -}}
+{{-   $slackApiToken = promptStringOnce $data.user "slackApiToken" "Slack API token" $slackApiToken -}}
+{{- end -}}
+{{- if not (env "TABBY_CONFIG_ID")) -}}
+{{-   $tabbyConfigId = promptStringOnce $data.user "tabbyConfigId" "Tabby configuration ID" $tabbyConfigId -}}
+{{- end -}}
 {{- if not (env "TABBY_SYNC_TOKEN")) -}}
 {{-   $tabbySyncToken = promptStringOnce $data.user "tabbySyncToken" "Tabby Sync token" $tabbySyncToken -}}
 {{- end -}}
diff --git a/.local/share/chezmoi/home/.chezmoidata.yaml b/.local/share/chezmoi/home/.chezmoidata.yaml
index 4df3d0c3..19aae01c 100644
--- a/.local/share/chezmoi/home/.chezmoidata.yaml
+++ b/.local/share/chezmoi/home/.chezmoidata.yaml
@@ -74,7 +74,6 @@ softwareGroups:
   Standard: &standard
     - *basic
     - ansible
-    - ansibleconnect
     - aria2
     - asdf
     - automake
@@ -172,6 +171,8 @@ softwareGroups:
     - yq
     - yubikey-manager
     - zsh
+  CLI-Extras:
+    - ansibleconnect
   Standard-Desktop: &standardDesktop
     - *basicDesktop
     - autokey