diff --git a/21.Initialize_configuration_file/0_setup.sh b/21.Initialize_configuration_file/0_setup.sh
index f7c32608a69b1aad4bafe7cbd69536e5a23dddc0..3c56e495fd116da48c37e5827ac932c6ee4a50f1 100755
--- a/21.Initialize_configuration_file/0_setup.sh
+++ b/21.Initialize_configuration_file/0_setup.sh
@@ -2,13 +2,15 @@
 source /root/envsetup/conf.sh
 
 # Download config file from skyreach
-conf_url="https://$SKYREACH_HOST/erp/credentials/$SKYREACH_API_KEY/conf.sh"
-if ( curl -I "$conf_url" >/dev/null ); then
-	wget -q "$conf_url" -O /root/envsetup/conf.sh
-	source /root/envsetup/conf.sh
-else
-	echo "Failed to download configuration using url:"
-	echo "    $conf_url"
+if ( ! test -z ${SKYREACH_API_KEY} ); then
+	conf_url="https://$SKYREACH_HOST/erp/credentials/$SKYREACH_API_KEY/conf.sh"
+	if ( curl -I "$conf_url" >/dev/null ); then
+		wget -q "$conf_url" -O /root/envsetup/conf.sh
+		source /root/envsetup/conf.sh
+	else
+		echo "Failed to download configuration using url:"
+		echo "    $conf_url"
+	fi
 fi
 
 # Autogenerate missing values
diff --git a/23.Initialize_APT/0_setup.sh b/23.Initialize_APT/0_setup.sh
index 4aa2784e854736eb5f818409b5cafddba8f24bd1..76b973a04de7a47139c3ac47b084686576143088 100755
--- a/23.Initialize_APT/0_setup.sh
+++ b/23.Initialize_APT/0_setup.sh
@@ -22,16 +22,20 @@ apt-get install -y aptitude apt-transport-https
 #apt-get dist-upgrade -y
 
 # modify sources.list to use ubicast cache
-if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
-	echo "Updating sources.list to use cache ${APT_CACHE_HOST}."
-	sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
+if ( ! test -z ${APT_CACHE_HOST} ); then
+	if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
+		echo "Updating sources.list to use cache ${APT_CACHE_HOST}."
+		sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
+	fi
 fi
 
 # APT panel
-echo "Adding skyreach.list to APT sources."
-wget -q "https://${SKYREACH_HOST}/media/public.gpg" -O- | sudo apt-key add -
-echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
-apt-get update
+if ( ! test -z ${SKYREACH_API_KEY} ); then
+	echo "Adding skyreach.list to APT sources."
+	wget -q "https://${SKYREACH_HOST}/media/public.gpg" -O- | sudo apt-key add -
+	echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
+	apt-get update
+fi
 
 # unattended-upgrades
 echo "Installing and configuring unattended-upgrades."
diff --git a/default-conf.sh b/default-conf.sh
index aacfadfea64b0c2077bf76acc2c763fb1d8111cb..a247a6e64b6e1507e349cd48cef8bbcf21aceffe 100644
--- a/default-conf.sh
+++ b/default-conf.sh
@@ -12,7 +12,7 @@ NC='\033[0m'
 # -- System --
 # Skyreach in which system looks for packages
 SKYREACH_HOST='panel.ubicast.eu'
-SKYREACH_API_KEY='sde6b2af8d9feb2153d82e8183aa26a5'
+SKYREACH_API_KEY=
 # NTP
 NTP_SERVER1='ntp.ubuntu.com'
 NTP_SERVER2=