diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh
index 683ee0db7f..106d903338 100755
--- a/ush/detect_machine.sh
+++ b/ush/detect_machine.sh
@@ -75,8 +75,7 @@ elif [[ -d /scratch1 ]]; then
   MACHINE_ID=hera
 elif [[ -d /work ]]; then
   # We are on MSU Orion or Hercules
-  if [[ -d /apps/other ]]; then
-    # We are on Hercules
+  if [[ $(findmnt -n -o SOURCE /home) =~ "hercules" ]]; then
     MACHINE_ID=hercules
   else
     MACHINE_ID=orion
diff --git a/workflow/hosts.py b/workflow/hosts.py
index 2334a3ac35..4b86bf4705 100644
--- a/workflow/hosts.py
+++ b/workflow/hosts.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import os
+import socket
 from pathlib import Path
 
 from wxflow import YAMLFile
@@ -39,10 +40,7 @@ def detect(cls):
         if os.path.exists('/scratch1/NCEPDEV'):
             machine = 'HERA'
         elif os.path.exists('/work/noaa'):
-            if os.path.exists('/apps/other'):
-                machine = 'HERCULES'
-            else:
-                machine = 'ORION'
+            machine = socket.gethostname().split("-",1)[0].upper()
         elif os.path.exists('/lfs4/HFIP'):
             machine = 'JET'
         elif os.path.exists('/lfs/f1'):