diff --git a/action.yml b/action.yml
index d5fb884..4aa0680 100644
--- a/action.yml
+++ b/action.yml
@@ -67,8 +67,8 @@ runs:
         # Ntfy
         NTFY_URL: ${{ inputs.ntfy_url || 'https://ntfy.hcmc.online' }}
         NTFY_TOPIC: ${{ inputs.ntfy_topic || 'act_runner_deployment' }}
-        NTFY_USER: ${{ inputs.ntfy_username || env.USER }}
-        NTFY_PASS: ${{ inputs.ntfy_password || env.PASS }}
+        NTFY_USERNAME: ${{ inputs.ntfy_username || env.NTFY_USERNAME }}
+        NTFY_PASSWORD: ${{ inputs.ntfy_password || env.NTFY_PASSWORD }}
         GIT_URL: ${{ inputs.server_url || 'https://git.hcmc.online' }}
         
         # Gmail
diff --git a/notify.sh b/notify.sh
index 846703b..5a2455f 100644
--- a/notify.sh
+++ b/notify.sh
@@ -23,8 +23,8 @@ send_ntfy() {
   echo -e "  ${YELLOW}Debug Info:${NC}"
   echo -e "    NTFY_URL: ${GREEN}${NTFY_URL:-'(not set)'}${NC}"
   echo -e "    NTFY_TOPIC: ${GREEN}${NTFY_TOPIC:-'(not set)'}${NC}"
-  echo -e "    NTFY_USERNAME: ${GREEN}${NTFY_USER:-'(not set)'}${NC}"
-  echo -e "    NTFY_PASSWORD: ${GREEN}${NTFY_PASS:+'***set***'}${NTFY_PASS:-'(not set)'}${NC}"
+  echo -e "    NTFY_USERNAME: ${GREEN}${NTFY_USERNAME:-'(not set)'}${NC}"
+  echo -e "    NTFY_PASSWORD: ${GREEN}${NTFY_PASSWORD:+'***set***'}${NTFY_PASSWORD:-'(not set)'}${NC}"
   echo ""
   
   if [ -n "$NTFY_URL" ] && [ -n "$NTFY_TOPIC" ]; then
@@ -44,8 +44,8 @@ send_ntfy() {
     fi
     
     # Check for Basic Auth
-    if [ -n "$NTFY_USER" ] && [ -n "$NTFY_PASS" ]; then
-      auth_args="-u $NTFY_USER:$NTFY_PASS"
+    if [ -n "$NTFY_USERNAME" ] && [ -n "$NTFY_PASSWORD" ]; then
+      auth_args="-u $NTFY_USERNAME:$NTFY_PASSWORD"
       echo -e "  ${GREEN}✓${NC} Using Basic Authentication"
     else
       echo -e "  ${YELLOW}⚠${NC} No authentication (public topic)"