diff --git a/installJRMC b/installJRMC
index c724e42..6596988 100755
--- a/installJRMC
+++ b/installJRMC
@@ -158,10 +158,6 @@ init() {
 
     debug "Detected host platform: $ID $VERSION_ID $ARCH"
 
-    # Set defaults
-    BUILD_TARGET="${BUILD_TARGET:-$ID}"
-    REPO_TARGET="${REPO_TARGET:-$ID}"
-
     # Normalize ID and set distro-specific vars
     case $ID in
         debian|arch) ;;
@@ -195,6 +191,10 @@ init() {
             fi
     esac
 
+    # Set defaults
+    BUILD_TARGET="${BUILD_TARGET:-$ID}"
+    REPO_TARGET="${REPO_TARGET:-$ID}"
+
     # Match the MC repo to the system
     if [[ $ID == debian || $ID == ubuntu ]]; then
         MC_DEFAULT_REPO=${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_DEFAULT_REPO}}