diff --git a/ct/hermesagent.sh b/ct/hermesagent.sh
index f885a3f2..460933d4 100644
--- a/ct/hermesagent.sh
+++ b/ct/hermesagent.sh
@@ -45,10 +45,10 @@ function update_script() {
   msg_ok "Stopped Services"
 
   msg_info "Updating ${APP}"
-  $STD env \
-    HOME=/home/hermes \
-    HERMES_HOME=/home/hermes/.hermes \
+  $STD setsid --wait bash -c '
+    set -a; source /etc/default/hermes; set +a
     /home/hermes/.local/bin/hermes update --yes
+  '
   chown -R hermes:hermes /home/hermes
   msg_ok "Updated ${APP}"
 
diff --git a/install/hermesagent-install.sh b/install/hermesagent-install.sh
index 7a3e8dd5..99d065c4 100644
--- a/install/hermesagent-install.sh
+++ b/install/hermesagent-install.sh
@@ -45,11 +45,10 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
 fi
 
 msg_info "Installing Hermes Agent"
-$STD setsid --wait env \
-  HOME=/home/hermes \
-  PATH=/home/hermes/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-  NODE_OPTIONS=${NODE_OPTIONS} \
+$STD setsid --wait bash -c '
+  set -a; source /etc/default/hermes; set +a
   bash <(curl -fsSL https://hermes-agent.nousresearch.com/install.sh) --skip-setup --hermes-home /home/hermes/.hermes --dir /home/hermes/.hermes/hermes-agent
+'
 chown -R hermes:hermes /home/hermes
 chmod 750 /home/hermes
 chmod 700 /home/hermes/.hermes