diff --git a/git-hangman-lab/SKILL.md b/git-hangman-lab/SKILL.md
index 3eea903..5b446f3 100644
--- a/git-hangman-lab/SKILL.md
+++ b/git-hangman-lab/SKILL.md
@@ -73,7 +73,7 @@ Enable or disable local login on Gitea.
 
 ### Reset Password
 
-Reset password for the current user (reads username from pass_mgr).
+Reset password for the current user (reads username from secret-mgr).
 
 ```bash
 {baseDir}/scripts/git/git-ctrl reset-password
diff --git a/git-hangman-lab/scripts/git/check-git-cred b/git-hangman-lab/scripts/git/check-git-cred
index 49946ff..f0be59f 100755
--- a/git-hangman-lab/scripts/git/check-git-cred
+++ b/git-hangman-lab/scripts/git/check-git-cred
@@ -3,11 +3,11 @@ set -euo pipefail
 
 GIT_URL="https://git.hangman-lab.top"
 
-USER="$(pass_mgr get-username --key git)"
-PASS="$(pass_mgr get-secret --key git)"
+USER="$(secret-mgr get-username --key git)"
+PASS="$(secret-mgr get-secret --key git)"
 
 if [[ -z "$USER" || -z "$PASS" ]]; then
-  echo "Missing credentials from pass_mgr (key: git)"
+  echo "Missing credentials from secret-mgr (key: git)"
   exit 2
 fi
 
diff --git a/git-hangman-lab/scripts/git/create-git-account b/git-hangman-lab/scripts/git/create-git-account
index 1b43a08..adbe2cc 100755
--- a/git-hangman-lab/scripts/git/create-git-account
+++ b/git-hangman-lab/scripts/git/create-git-account
@@ -28,11 +28,11 @@ if [[ -z "$username" || -z "$email" ]]; then
 fi
 
 # Generate git credentials (do not print secret)
-pass_mgr generate --username "$username" --key git >/dev/null
+secret-mgr generate --username "$username" --key git >/dev/null
 
 # Create gitea user
 "$SCRIPT_DIR/gitea" admin user create \
-  --username "$(pass_mgr get-username --key git)" \
-  --password "$(pass_mgr get-secret --key git)" \
+  --username "$(secret-mgr get-username --key git)" \
+  --password "$(secret-mgr get-secret --key git)" \
   --email "$email" \
   --must-change-password=false
diff --git a/git-hangman-lab/scripts/git/generate-access-token b/git-hangman-lab/scripts/git/generate-access-token
index 8e5ded1..94e660a 100755
--- a/git-hangman-lab/scripts/git/generate-access-token
+++ b/git-hangman-lab/scripts/git/generate-access-token
@@ -6,9 +6,9 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # Verify git credentials first
 "$SCRIPT_DIR/check-git-cred"
 
-username=$(pass_mgr get-username --key git)
+username=$(secret-mgr get-username --key git)
 token=$("$SCRIPT_DIR/gitea" admin user generate-access-token --username "$username" --token-name "$username")
 
-pass_mgr set --key git-access-token --username "$username" --secret "$token"
+secret-mgr set --key git-access-token --username "$username" --secret "$token"
 
 echo "Access token generated and stored successfully"
diff --git a/git-hangman-lab/scripts/git/link-keycloak b/git-hangman-lab/scripts/git/link-keycloak
index f635e42..c8815b2 100755
--- a/git-hangman-lab/scripts/git/link-keycloak
+++ b/git-hangman-lab/scripts/git/link-keycloak
@@ -4,12 +4,12 @@ set -euo pipefail
 # Get the directory where this script is located
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-USERNAME=$(pass_mgr get-username --key git)
-KC_PASS=$(pass_mgr get-secret --key keycloak)
-GITEA_PASS=$(pass_mgr get-secret --key git)
+USERNAME=$(secret-mgr get-username --key git)
+KC_PASS=$(secret-mgr get-secret --key keycloak)
+GITEA_PASS=$(secret-mgr get-secret --key git)
 
 if [[ -z "$USERNAME" || -z "$KC_PASS" || -z "$GITEA_PASS" ]]; then
-  echo "[ERROR] Missing required credentials in pass_mgr" >&2
+  echo "[ERROR] Missing required credentials in secret-mgr" >&2
   exit 1
 fi
 
diff --git a/git-hangman-lab/scripts/git/repo-add-collaborators b/git-hangman-lab/scripts/git/repo-add-collaborators
index 00e5081..de22e40 100755
--- a/git-hangman-lab/scripts/git/repo-add-collaborators
+++ b/git-hangman-lab/scripts/git/repo-add-collaborators
@@ -39,12 +39,12 @@ if [[ "$roster" == "true" ]]; then
   repo=".roster"
   
   # Check if git-adm key exists
-  if ! pass_mgr list | grep -q "git-adm"; then
+  if ! secret-mgr list | grep -q "git-adm"; then
     echo "you dont have permission to run this script"
     exit 1
   fi
   
-  token=$(pass_mgr get-secret --key git-adm)
+  token=$(secret-mgr get-secret --key git-adm)
 else
   # Check if repo and git-access-token are provided
   if [[ -z "$repo" ]]; then
@@ -52,13 +52,13 @@ else
     exit 1
   fi
   
-  if ! pass_mgr list | grep -q "git-access-token"; then
+  if ! secret-mgr list | grep -q "git-access-token"; then
     echo "generate your access token first"
     exit 1
   fi
   
-  owner=$(pass_mgr get-username --key git)
-  token=$(pass_mgr get-secret --key git-access-token)
+  owner=$(secret-mgr get-username --key git)
+  token=$(secret-mgr get-secret --key git-access-token)
 fi
 
 # Execute
diff --git a/git-hangman-lab/scripts/git/repo-config b/git-hangman-lab/scripts/git/repo-config
index d6f8eeb..ea8f816 100755
--- a/git-hangman-lab/scripts/git/repo-config
+++ b/git-hangman-lab/scripts/git/repo-config
@@ -57,11 +57,11 @@ if ! is_git_repo "$REPO_PATH"; then
   exit 1
 fi
 
-USER="$(pass_mgr get-username --key git)"
-PASS="$(pass_mgr get-secret --key git)"
+USER="$(secret-mgr get-username --key git)"
+PASS="$(secret-mgr get-secret --key git)"
 
 if [[ -z "$USER" || -z "$PASS" ]]; then
-  echo "Missing credentials from pass_mgr (key: git)"
+  echo "Missing credentials from secret-mgr (key: git)"
   exit 2
 fi
 
diff --git a/git-hangman-lab/scripts/git/reset-password b/git-hangman-lab/scripts/git/reset-password
index 355cb8d..2e3f0aa 100755
--- a/git-hangman-lab/scripts/git/reset-password
+++ b/git-hangman-lab/scripts/git/reset-password
@@ -3,15 +3,15 @@
 # Get the directory where this script is located
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-# Get username from pass_mgr
-username=$(pass_mgr get-username --key git)
+# Get username from secret-mgr
+username=$(secret-mgr get-username --key git)
 if [[ -z "$username" ]]; then
-  echo "Error: No username found in pass_mgr for key 'git'"
+  echo "Error: No username found in secret-mgr for key 'git'"
   exit 1
 fi
 
 # Generate new password
-password=$(pass_mgr generate --key git --username "$username")
+password=$(secret-mgr generate --key git --username "$username")
 
 # Update password via gitea admin
 "$SCRIPT_DIR/gitea" admin user change-password --username "$username" --password "$password" --must-change-password=false
diff --git a/keycloak-hangman-lab/SKILL.md b/keycloak-hangman-lab/SKILL.md
index 372b564..f6460c9 100644
--- a/keycloak-hangman-lab/SKILL.md
+++ b/keycloak-hangman-lab/SKILL.md
@@ -35,7 +35,7 @@ Set user firstName and lastName in Keycloak.
 
 ### Reset Password
 
-Reset password for the current user (reads username from pass_mgr).
+Reset password for the current user (reads username from secret-mgr).
 
 ```bash
 {baseDir}/scripts/keycloak/kc-ctrl reset-password
diff --git a/keycloak-hangman-lab/scripts/keycloak/create-keycloak-account b/keycloak-hangman-lab/scripts/keycloak/create-keycloak-account
index b54c53d..c5a23cf 100755
--- a/keycloak-hangman-lab/scripts/keycloak/create-keycloak-account
+++ b/keycloak-hangman-lab/scripts/keycloak/create-keycloak-account
@@ -28,11 +28,11 @@ if [[ -z "$username" || -z "$email" ]]; then
 fi
 
 # Generate keycloak credentials (do not print secret)
-pass_mgr generate --username "$username" --key keycloak >/dev/null
+secret-mgr generate --username "$username" --key keycloak >/dev/null
 
 # Get the generated username and password
-user=$(pass_mgr get-username --key keycloak)
-pass=$(pass_mgr get-secret --key keycloak)
+user=$(secret-mgr get-username --key keycloak)
+pass=$(secret-mgr get-secret --key keycloak)
 
 realm="Hangman-Lab"
 
diff --git a/keycloak-hangman-lab/scripts/keycloak/reset-password b/keycloak-hangman-lab/scripts/keycloak/reset-password
index 2360eb0..a153b96 100755
--- a/keycloak-hangman-lab/scripts/keycloak/reset-password
+++ b/keycloak-hangman-lab/scripts/keycloak/reset-password
@@ -3,17 +3,17 @@
 # Get the directory where this script is located
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-# Get username from pass_mgr
-username=$(pass_mgr get-username --key keycloak)
+# Get username from secret-mgr
+username=$(secret-mgr get-username --key keycloak)
 if [[ -z "$username" ]]; then
-  echo "Error: No username found in pass_mgr for key 'keycloak'"
+  echo "Error: No username found in secret-mgr for key 'keycloak'"
   exit 1
 fi
 
 realm="Hangman-Lab"
 
 # Generate new password
-password=$(pass_mgr generate --key keycloak --username "$username")
+password=$(secret-mgr generate --key keycloak --username "$username")
 
 # Update password via kcadm
 "$SCRIPT_DIR/kcadm" set-password -r "$realm" --username "$username" --new-password "$password"
diff --git a/keycloak-hangman-lab/scripts/keycloak/set-name b/keycloak-hangman-lab/scripts/keycloak/set-name
index 94386cb..479f07e 100755
--- a/keycloak-hangman-lab/scripts/keycloak/set-name
+++ b/keycloak-hangman-lab/scripts/keycloak/set-name
@@ -19,13 +19,13 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-# Default to pass_mgr if not provided
+# Default to secret-mgr if not provided
 if [[ -z "$username" ]]; then
-  username=$(pass_mgr get-username --key keycloak)
+  username=$(secret-mgr get-username --key keycloak)
 fi
 
 if [[ -z "$username" ]]; then
-  echo "Error: No keycloak username found in pass_mgr"
+  echo "Error: No keycloak username found in secret-mgr"
   exit 1
 fi
 
diff --git a/keycloak-hangman-lab/scripts/keycloak/verify-email b/keycloak-hangman-lab/scripts/keycloak/verify-email
index e329348..9befbe3 100755
--- a/keycloak-hangman-lab/scripts/keycloak/verify-email
+++ b/keycloak-hangman-lab/scripts/keycloak/verify-email
@@ -3,11 +3,11 @@
 # Get the directory where this script is located
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-# Get username from pass_mgr
-username=$(pass_mgr get-username --key keycloak)
+# Get username from secret-mgr
+username=$(secret-mgr get-username --key keycloak)
 
 if [[ -z "$username" ]]; then
-  echo "Error: No keycloak username found in pass_mgr"
+  echo "Error: No keycloak username found in secret-mgr"
   exit 1
 fi