diff --git a/install/script/install_docker.sh b/install/script/install_docker.sh
index 4b66de5..5268ec2 100644
--- a/install/script/install_docker.sh
+++ b/install/script/install_docker.sh
@@ -1,3 +1,5 @@
+. ./docker.sh
+
 install_docker() {
 
 	echo 
@@ -9,8 +11,7 @@ install_docker() {
 
 	fi
   
-  # build SatoshiPortal images
-  local arch=$(uname -m) #x86_64
+  local arch=$(uname -m) # TODO: is this correct for every host
 
   if [[ $BITCOIN_INTERNAL == true ]]; then
   	build_docker_image ../SatoshiPortal/dockers/$arch/bitcoin-core cyphernode/bitcoin
diff --git a/install/script/setup.sh b/install/script/setup.sh
index c7c39a3..d48451f 100755
--- a/install/script/setup.sh
+++ b/install/script/setup.sh
@@ -3,7 +3,6 @@
 . ./trace.sh
 . ./configure.sh
 . ./install.sh
-. ./docker.sh
 
 CONFIGURE=0
 INSTALL=0