diff --git a/101.Apply_client_configuration/0_setup.sh b/101.Apply_client_configuration/0_setup.sh
index b74ba7a541f4cc531e484df70579255bf2195c57..ad3c41e3aae6415fb2fbf28cfeb4937af50d1c14 100755
--- a/101.Apply_client_configuration/0_setup.sh
+++ b/101.Apply_client_configuration/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 echo -e "
 ${RED}Customer parameters will be applied after rebooting. Note that you won't be able to login to the machine after this operation !${NC}"	
diff --git a/102.Run_tests/0_setup.sh b/102.Run_tests/0_setup.sh
index d680c986d07c151097b2273515db5c7805aeb96f..9291b8aa9efee00e7ba322742122fb3969f7e305 100755
--- a/102.Run_tests/0_setup.sh
+++ b/102.Run_tests/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # generate post-deployment conf file
 echo "SOURCES.LIST" > /root/deployment.results
diff --git a/103.Configure_client_smtp/0_setup.sh b/103.Configure_client_smtp/0_setup.sh
index 30057a2beb6b447a0b4834ddf46cc35430a9b34d..412473307f3623e526d1a871fbf39390546d7245 100755
--- a/103.Configure_client_smtp/0_setup.sh
+++ b/103.Configure_client_smtp/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # set SMTP
 if ( ! test -z ${EMAIL_SMTP_SERVER} )
diff --git a/104.Apply_default_configuration/0_setup.sh b/104.Apply_default_configuration/0_setup.sh
index 8888458be7266cc77530eb43a61e2ad280abf856..e3527b7a2f58ab5aa711af3e8ddb9adf5091d544 100755
--- a/104.Apply_default_configuration/0_setup.sh
+++ b/104.Apply_default_configuration/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # apply MS default network parameters
 sudo sed -i "s@address .*@address 192.168.1.10@" /etc/network/interfaces
diff --git a/105.Insert_wowza_license/0_setup.sh b/105.Insert_wowza_license/0_setup.sh
index c3dfd93b06572e63b78194395124f4f03c799e6f..8487c869242a33f754face583df367103c69aa5e 100755
--- a/105.Insert_wowza_license/0_setup.sh
+++ b/105.Insert_wowza_license/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 echo "Insert wowza license key :"
 read WOWZA_LICENSE2
diff --git a/21.Initialize_environment/0_setup.sh b/21.Initialize_environment/0_setup.sh
index 73ae54fcc98a75e496a17ab4b8fb5ad76d0528a9..eef646618ea0d903534cf6c2fe0db9acfaa09c02 100755
--- a/21.Initialize_environment/0_setup.sh
+++ b/21.Initialize_environment/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # hostname
 echo "127.0.0.1       ${ETC_HOSTNAME}" >> /etc/hosts
diff --git a/22.Initialize_configuration_file/0_setup.sh b/22.Initialize_configuration_file/0_setup.sh
index 85036900536c199266977cb5a42a1b1229d6230e..39758b2710c87cf1ab3489dd10239d04199733e7 100755
--- a/22.Initialize_configuration_file/0_setup.sh
+++ b/22.Initialize_configuration_file/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # Conf setup
 sed -i "s@^NTP_SERVER1 = .*@NTP_SERVER1 = '${NTP}'@" /root/envsetup/conf.py
diff --git a/23.Deploy_ssl_certificate/0_setup.sh b/23.Deploy_ssl_certificate/0_setup.sh
index 74a0ca311251b6180e80218c63e28ab1809bed67..de2b4d96d36c708c386e5f866c869de45064939c 100755
--- a/23.Deploy_ssl_certificate/0_setup.sh
+++ b/23.Deploy_ssl_certificate/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # deploy ssl certificate
 if ( test ${SSL_CERTIFICATE} )
diff --git a/31.Install_munin/0_setup.sh b/31.Install_munin/0_setup.sh
index 945d63175d59990962fd87d878aedc4fcebc4f16..50dd6f128304619c93b993619a445e4d6b5d033d 100755
--- a/31.Install_munin/0_setup.sh
+++ b/31.Install_munin/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # This script should be run after Nginx and Wowza setup (if they should be installed)
 
diff --git a/41.Install_MS/0_setup.sh b/41.Install_MS/0_setup.sh
index 099a5c317f4b72dc6b90e92ecc02ccaea82fbb54..7e1c03c253e11415ba899fc1a45f97aa3850fc23 100755
--- a/41.Install_MS/0_setup.sh
+++ b/41.Install_MS/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # installation mediaserver
 DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
diff --git a/42.nginx_tweaks/0_setup.sh b/42.nginx_tweaks/0_setup.sh
index 2dccc9e66b21af238ff0f9e78418301a7c434dc8..f063df6c660299e7d0cc840b16c22d2b72933aca 100755
--- a/42.nginx_tweaks/0_setup.sh
+++ b/42.nginx_tweaks/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # optimisations nginx
 if ( test -f /etc/nginx/nginx.conf )
diff --git a/51.Install_CM/0_setup.sh b/51.Install_CM/0_setup.sh
index a6f5f03026afd9623f0394c8455b0f370eacfbb7..73ffc2590ded6aa62a1b23ebc0275dd46618735b 100755
--- a/51.Install_CM/0_setup.sh
+++ b/51.Install_CM/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 #APT_CACHER_PWD=$(cat ${CONF} | egrep ^APT_CACHER_PWD | head -1 | awk -F "=" '{print$2}')
 APT_CACHER_PWD=$(pwgen 12)
diff --git a/71.Install_a_cache/0_setup.sh b/71.Install_a_cache/0_setup.sh
index deeed6705cc8c7abe38daaa66cf9b8b9d46b82ea..ac90ec7e0552d1f278bd74cb490381f14ac79455 100755
--- a/71.Install_a_cache/0_setup.sh
+++ b/71.Install_a_cache/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 sed -i "s@\[CLIENT\]@$(hostname)@" default
 sed -i "s@\[CACHE_DIR\]@${CACHE_DIR}@" default
diff --git a/72.Deploy_munin_configuration/0_setup.sh b/72.Deploy_munin_configuration/0_setup.sh
index d50308344e829db94c8d02834a907cced665f3b1..285fc051fb592f98917775b4faa9a5a34f332d8d 100755
--- a/72.Deploy_munin_configuration/0_setup.sh
+++ b/72.Deploy_munin_configuration/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 # for munin
 DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config
diff --git a/73.Install_ferm/0_setup.sh b/73.Install_ferm/0_setup.sh
index 3786d80fbe26079540af7525102ee7f80c2032a9..1cc236dc87e6ba679469500695e6406eeb589d19 100755
--- a/73.Install_ferm/0_setup.sh
+++ b/73.Install_ferm/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 DEBIAN_FRONTEND=noninteractive aptitude install -y ferm
 cp ferm.conf /etc/ferm/ferm.conf
diff --git a/81.Install_MV/0_setup.sh b/81.Install_MV/0_setup.sh
index ebe568f82a187d09eaed4633867132351b2860fa..1ab9da8b7a0ad4d8e81847eca880312793028170 100755
--- a/81.Install_MV/0_setup.sh
+++ b/81.Install_MV/0_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 aptitude install -y dialog
 cd /root
diff --git a/conf.sh b/conf.sh
index 1c77a455b8a2e5c84c69ca9ebd426e1eac3ca19e..0815015727f5da9819889d05cce8f567ae8cb520 100644
--- a/conf.sh
+++ b/conf.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 # Envsetup local configuration file
 # See default configuration in default-conf.sh
-#
+
+source default-conf.sh
+
 # Put your configuration here
diff --git a/tests/test_apt.sh b/tests/test_apt.sh
index 3c185764610635df74fe128893628fecc915a8d9..74a1587714b94803437eacd13dac5744ab8448cd 100755
--- a/tests/test_apt.sh
+++ b/tests/test_apt.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 echo "Testing apt-get upgrade"
 
diff --git a/tests/test_ntp.sh b/tests/test_ntp.sh
index 6b56c61ecc461a617a5a09206ad061a8a94b4319..1a68cacba3660e172165e724fd7e288cdc2af914 100755
--- a/tests/test_ntp.sh
+++ b/tests/test_ntp.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
 
 set -e