diff --git a/src/agency-agents/devcontainer-feature.json b/src/agency-agents/devcontainer-feature.json
index 5738d13..8086b0a 100644
--- a/src/agency-agents/devcontainer-feature.json
+++ b/src/agency-agents/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "agency-agents",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "name": "Agency Agents",
   "description": "A complete AI agency at your fingertips - From frontend wizards to Reddit community ninjas, from whimsy injectors to reality checkers. Each agent is a specialized expert with personality, processes, and proven deliverables. Credits: https://github.com/msitarzewski/agency-agents.",
   "documentationURL": "https://github.com/wcgomes/devcontainer-features?tab=readme-ov-file#feature-agency-agents",
diff --git a/src/agency-agents/install.sh b/src/agency-agents/install.sh
index ca912a0..6db1fbc 100644
--- a/src/agency-agents/install.sh
+++ b/src/agency-agents/install.sh
@@ -83,6 +83,13 @@ ensure_prerequisites
 marker_dir="/usr/local/share/devcontainer-features"
 mkdir -p "$marker_dir"
 
+config_file="$marker_dir/agency-agents.conf"
+cat > "$config_file" <<EOF
+TOOL="${TOOL:-auto}"
+AUTOUPDATE="${AUTOUPDATE:-true}"
+DIVISIONS="${DIVISIONS:-}"
+EOF
+
 poststart_script="$(dirname "$0")/postStartCommand.sh"
 if [ -f "$poststart_script" ]; then
   cp "$poststart_script" "$marker_dir/agency-agents-postStartCommand.sh"
diff --git a/src/agency-agents/postStartCommand.sh b/src/agency-agents/postStartCommand.sh
index 21ce727..82756cf 100755
--- a/src/agency-agents/postStartCommand.sh
+++ b/src/agency-agents/postStartCommand.sh
@@ -4,6 +4,11 @@ set -euo pipefail
 MARKER="${HOME}/.local/share/devcontainer-features/agency-agents.done"
 COMMIT_FILE="${HOME}/.local/share/devcontainer-features/agency-agents.commit"
 
+config_file="/usr/local/share/devcontainer-features/agency-agents.conf"
+if [ -f "$config_file" ]; then
+  . "$config_file"
+fi
+
 TARGET_USER="${USER:-$(whoami)}"
 [ -z "$TARGET_USER" ] && TARGET_USER="$(getent passwd | awk -F: '$3 >= 1000 {print $1; exit 0}')"
 [ -z "$TARGET_USER" ] && TARGET_USER="vscode"
diff --git a/src/agents-workspace/devcontainer-feature.json b/src/agents-workspace/devcontainer-feature.json
index 82949e5..7a35688 100644
--- a/src/agents-workspace/devcontainer-feature.json
+++ b/src/agents-workspace/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "agents-workspace",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "name": "Agents Workspace",
   "description": "AI agent workspace with specialist agents for orchestrated, minimal, and self-learning workflows.",
   "documentationURL": "https://github.com/wcgomes/devcontainer-features?tab=readme-ov-file#feature-agents-workspace",
diff --git a/src/agents-workspace/install.sh b/src/agents-workspace/install.sh
index b5fd1ec..6fe4457 100644
--- a/src/agents-workspace/install.sh
+++ b/src/agents-workspace/install.sh
@@ -83,6 +83,14 @@ ensure_prerequisites
 marker_dir="/usr/local/share/devcontainer-features"
 mkdir -p "$marker_dir"
 
+config_file="$marker_dir/agents-workspace.conf"
+cat > "$config_file" <<EOF
+TOOL="${TOOL:-all}"
+INCLUDEAGENCY="${INCLUDEAGENCY:-true}"
+AUTOUPDATE="${AUTOUPDATE:-true}"
+DIVISIONS="${DIVISIONS:-}"
+EOF
+
 poststart_script="$(dirname "$0")/postStartCommand.sh"
 if [ -f "$poststart_script" ]; then
   cp "$poststart_script" "$marker_dir/agents-workspace-postStartCommand.sh"
diff --git a/src/agents-workspace/postStartCommand.sh b/src/agents-workspace/postStartCommand.sh
index 064cd57..1411967 100755
--- a/src/agents-workspace/postStartCommand.sh
+++ b/src/agents-workspace/postStartCommand.sh
@@ -5,6 +5,11 @@ MARKER="${HOME}/.local/share/devcontainer-features/agents-workspace.done"
 COMMIT_FILE="${HOME}/.local/share/devcontainer-features/agents-workspace.commit"
 AGENCY_COMMIT_FILE="${HOME}/.local/share/devcontainer-features/agency-agents.commit"
 
+config_file="/usr/local/share/devcontainer-features/agents-workspace.conf"
+if [ -f "$config_file" ]; then
+  . "$config_file"
+fi
+
 TARGET_USER="${USER:-$(whoami)}"
 [ -z "$TARGET_USER" ] && TARGET_USER="$(getent passwd | awk -F: '$3 >= 1000 {print $1; exit 0}')"
 [ -z "$TARGET_USER" ] && TARGET_USER="vscode"