diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 160ece6..3744e22 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -24,11 +24,11 @@ jobs:
               "git-lfs", 
               "github-cli", 
               "go", 
-              "gradle", 
+              "java gradle",        # Install 'java', then 'gradle'
               "hugo",
               "java",
               "jekyll",
-              "python jupyterlab", # Install 'python', then 'jupyterlab'
+              "python jupyterlab",  # Install 'python', then 'jupyterlab'
               "kubectl-helm-minikube", 
               "maven", 
               "node", 
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index 1f5e79b..d5714c7 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -12,6 +12,7 @@ on:
         default: 'ubuntu:focal'
       logLevel:
         description: 'Log Level (info/debug/trace)'
+        required: true
         default: 'info'
 
 jobs:
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 96a81d9..fcfe91f 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -24,7 +24,7 @@ jobs:
           git-lfs: ./**/git-lfs/**
           github-cli: ./**/github-cli/**
           go: ./**/go/**
-          gradle: ./**/gradle/**
+          'java gradle': ./**/gradle/**
           hugo: ./**/hugo/**
           java: ./**/java/**
           jekyll: ./**/jekyll/**
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 9c5706f..f7dfd0b 100644
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -7,7 +7,7 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/anaconda.md
 # Maintainer: The VS Code and Codespaces Teams
 #
-# Syntax: ./anaconda-debian.sh [Conda version] [CONDA_DIR] [Non-root user] [Add rc files flag]
+# Syntax: ./anaconda-debian.sh [Conda version] [Non-root user] [Add rc files flag]
 
 VERSION=${1:-"latest"}
 USERNAME=${2:-"automatic"}
diff --git a/src/gradle/install.sh b/src/gradle/install.sh
index 2fe7fa9..b88ea9c 100644
--- a/src/gradle/install.sh
+++ b/src/gradle/install.sh
@@ -7,12 +7,13 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/gradle.md
 # Maintainer: The VS Code and Codespaces Teams
 #
-# Syntax: ./gradle-debian.sh [Gradle version] [SDKMAN_DIR] [non-root user] [Update rc files flag]
+# Syntax: ./gradle-debian.sh [Gradle version] [non-root user] [Update rc files flag]
 
 GRADLE_VERSION=${1:-"latest"}
-export SDKMAN_DIR=${2:-"/usr/local/sdkman"}
-USERNAME=${3:-"automatic"}
-UPDATE_RC=${4:-"true"}
+USERNAME=${2:-"automatic"}
+UPDATE_RC=${3:-"true"}
+
+SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
 
 set -e
 
diff --git a/src/hugo/feature.json b/src/hugo/feature.json
index 0b91ac1..1d06486 100644
--- a/src/hugo/feature.json
+++ b/src/hugo/feature.json
@@ -4,13 +4,19 @@
   "options": {
     "version": {
       "type": "string",
-      "proposals": ["latest"],
+      "proposals": [
+        "latest"
+      ],
       "default": "latest",
       "description": "Select or enter a version."
     }
   },
+  "containerEnv": {
+    "HUGO_DIR": "/usr/local/hugo",
+    "PATH": "${HUGO_DIR}/bin:${PATH}"
+  },
   "install": {
     "app": "",
     "file": "install.sh"
   }
-}
+}
\ No newline at end of file
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index 3913c7a..de1d03c 100644
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -10,10 +10,11 @@
 # Syntax: ./hugo-debian.sh [Hugo version] [HUGO_DIR] [Non-root user] [Add rc files flag]
 
 VERSION=${1:-"latest"}
-export HUGO_DIR=${2:-"/usr/local/hugo"}
 USERNAME=${3:-"automatic"}
 UPDATE_RC=${4:-"true"}
 
+HUGO_DIR=${HUGO_DIR:-"/usr/local/hugo"}
+
 set -e
 
 if [ "$(id -u)" -ne 0 ]; then