diff --git a/src/main/java/org/wpilib/gradlerio/deploy/systemcore/SystemCore.java b/src/main/java/org/wpilib/gradlerio/deploy/systemcore/SystemCore.java
index 884d9f56..7a0c6bfe 100644
--- a/src/main/java/org/wpilib/gradlerio/deploy/systemcore/SystemCore.java
+++ b/src/main/java/org/wpilib/gradlerio/deploy/systemcore/SystemCore.java
@@ -3,7 +3,7 @@
 import javax.inject.Inject;
 
 import org.gradle.api.Project;
-
+import org.gradle.internal.os.OperatingSystem;
 import org.wpilib.deployutils.deploy.DeployExtension;
 import org.wpilib.deployutils.deploy.target.location.SshDeployLocation;
 import org.wpilib.gradlerio.deploy.WPILibExtension;
@@ -70,10 +70,11 @@ public void useCustomSystemcoreHostName(String hostName) {
 
     public void setTeam(int team) {
         this.team = team;
+        OperatingSystem.current().isWindows();
+
         setAddresses(
             "10." + (team / 100) + "." + (team % 100) + ".2", // 10.TE.AM.2
-            "172.26.0.1", // Windows USB
-            "172.27.0.1", // Unix USB
+            OperatingSystem.current().isWindows() ? "172.26.0.1" : "172.27.0.1", // Windows USB : Unix USB
             "172.30.0.1" // WiFi
         );
     }