diff --git a/Src/StackifyLib/Models/EnvironmentDetail.cs b/Src/StackifyLib/Models/EnvironmentDetail.cs
index 83ea29f..5629ff1 100644
--- a/Src/StackifyLib/Models/EnvironmentDetail.cs
+++ b/Src/StackifyLib/Models/EnvironmentDetail.cs
@@ -189,7 +189,7 @@ public static string GetEC2InstanceId()
 #else
         public static string GetDeviceName()
         {
-            var deviceName = Process.GetCurrentProcess().MachineName;
+            var deviceName = Environment.MachineName;
             var isDefaultDeviceNameEc2 = IsEc2MachineName(deviceName);
 
             if (Config.IsEc2 == null || Config.IsEc2 == true || isDefaultDeviceNameEc2)