diff --git a/debian/resources/switch/package-all.sh b/debian/resources/switch/package-all.sh
index a21042b..5573fba 100755
--- a/debian/resources/switch/package-all.sh
+++ b/debian/resources/switch/package-all.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
-#initialize variable encase we are called directly
-[ -z $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM ] && USE_SWITCH_PACKAGE_UNOFFICIAL_ARM=false
+. ../config.sh
+. ../colors.sh
+. ../environment.sh
+. ../arguments.sh
 
 apt-get update && apt-get install -y --force-yes ntp curl memcached haveged
-arch=$(uname -m)
-if [ $arch = 'armv7l' ] && [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = true ]; then
+
+if [ ."$cpu_architecture" = ."arm" ]; then
         echo "deb http://repo.sip247.com/debian/freeswitch-stable-armhf/ jessie main" > /etc/apt/sources.list.d/freeswitch.list
         curl http://repo.sip247.com/debian/sip247.com.gpg.key | apt-key add -
 else
diff --git a/debian/resources/switch/package-release.sh b/debian/resources/switch/package-release.sh
index 11861e8..33a22ba 100755
--- a/debian/resources/switch/package-release.sh
+++ b/debian/resources/switch/package-release.sh
@@ -3,12 +3,13 @@
 #move to script directory so all relative paths work
 cd "$(dirname "$0")"
 
+. ../config.sh
 . ../colors.sh
+. ../environment.sh
 . ../arguments.sh
 
 apt-get update && apt-get install -y --force-yes curl memcached haveged
-arch=$(uname -m)
-if [ $arch = 'armv7l' ] && [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = true ]; then
+if [ ."$cpu_architecture" = ."arm" ]; then
         echo "deb http://repo.sip247.com/debian/freeswitch-stable-armhf/ jessie main" > /etc/apt/sources.list.d/freeswitch.list
         curl http://repo.sip247.com/debian/sip247.com.gpg.key | apt-key add -
 else