diff --git a/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/precheck.j2 b/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/precheck.j2
index 8342a49bdb9a..39f6928c55da 100644
--- a/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/precheck.j2
+++ b/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/precheck.j2
@@ -45,9 +45,7 @@ done
 
 
 # Get the status of yb-node-agent Service
-status=$(su - {{ yb_user }} -c \
-    "XDG_RUNTIME_DIR=/run/user/$(id -u {{ yb_user }}) systemctl --user show -p ActiveState \
-    \"$service_name\" | grep ActiveState | awk -F= '/ActiveState/ {print \$2}'")
+status=$(systemctl show -p ActiveState "$service_name" | grep ActiveState | awk -F= '{print $2}')
 if [ "$status" = "active" ]; then
     echo "\"$service_name\" is active"
     add_result "Service Status Check" "PASS" "$service_name is active"
@@ -57,9 +55,7 @@ else
 fi
 
 # Check the memory usage for yb-node-agent service
-memory=$(su - {{ yb_user }} -c \
-    "XDG_RUNTIME_DIR=/run/user/$(id -u {{ yb_user }}) systemctl --user show -p MemoryCurrent \
-    \"$service_name\" | grep MemoryCurrent | awk -F= '/MemoryCurrent/ {print \$2}'")
+memory=$(systemctl show -p MemoryCurrent "$service_name" | grep MemoryCurrent | awk -F= '{print $2}')
 if [ "$memory" -gt 0 ]; then
     echo "MemoryCurrent is greater than 0: $memory"
     add_result "Memory Usage Check" "PASS" "MemoryCurrent is greater than 0: $memory"
diff --git a/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/run.j2 b/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/run.j2
index 8cbb6aaa6f6c..16f7cb41e0be 100644
--- a/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/run.j2
+++ b/managed/node-agent/resources/ynp/modules/provision/node_agent/templates/run.j2
@@ -199,10 +199,8 @@ su - {{ yb_user }} -c "\"$installer_dir/node-agent-installer.sh\" -c install \
 --node_name {{ node_name }} --region_name {{ provider_region_name }} --node_ip {{ node_external_fqdn }} \
 --bind_ip {{ bind_ip }} --silent --skip_verify_cert $airgap_flag"
 
-loginctl enable-linger {{ yb_user }}
 # install node_agent service
-su - {{ yb_user }} -c "\"$installer_dir/node-agent-installer.sh\" -c install_service \
-    --user {{ yb_user }}"
+"$installer_dir/node-agent-installer.sh" -c install_service --user {{ yb_user }}
 
 if test -f "{{ tmp_directory }}/add_node_to_provider.json"; then
     get_nodes_in_provider=$(_get_nodes_in_provider $yba_url $customer_uuid $provider_id)