diff --git a/Run/run.sh b/Run/run.sh
index 5c1ec77666eb9e78a3d2838271b04dc5ccf13857..aa09ede69c2ebe46fb5956d2a1aa45005220d159 100755
--- a/Run/run.sh
+++ b/Run/run.sh
@@ -55,6 +55,12 @@ pyscript=../Source/Python/submit.py
 # INITIALIZE EMPTY PARAMETERLIST
 parameterlist=""
 
+# CHECK IF ON ECMWF SERVER; 
+if [[ $HOST == *"ecgb"* ]] || [[ $HOST == *"cca"* ]] || [[ $HOST == *"ccb"* ]]; then
+# LOAD PYTHON3 MODULE
+  module load python3
+fi 
+
 # CHECK FOR MORE PARAMETER 
 if [ -n "$START_DATE" ]; then
   parameterlist+=" --start_date=$START_DATE"
diff --git a/setup.sh b/setup.sh
index 64b055f421e3814b5a4e7ce64e6de04c1867e75e..a4c3a4ade9c6dae2b1b69e84fe934e778f58cb21 100755
--- a/setup.sh
+++ b/setup.sh
@@ -46,6 +46,12 @@ script="Source/Python/install.py"
 # INITIALIZE EMPTY PARAMETERLIST
 parameterlist=""
 
+# CHECK IF ON ECMWF SERVER; 
+if [[ $HOST == *"ecgb"* ]] || [[ $HOST == *"cca"* ]] || [[ $HOST == *"ccb"* ]]; then
+# LOAD PYTHON3 MODULE
+  module load python3
+fi 
+
 # DEFAULT PARAMETERLIST
 if [ -n "$TARGET" ]; then
   parameterlist=" --target=$TARGET"
@@ -56,7 +62,7 @@ else
 fi
 
 # CHECK FOR MORE PARAMETER 
-if [ "$TARGET" == "ecgate" ] || [ "$TARGET" == "cca" ]; then
+if [ "$TARGET" == "ecgate" ] || [ "$TARGET" == "cca" ] || [ "$TARGET" == "ccb" ]; then
   # check if necessary Parameters are set
   if [ -z "$ECUID" ] || [ -z "$ECGID" ] || [ "$ECUID" == "<username>" ] || [ "$ECGID" == "<groupID>" ] ; then
     echo "ERROR: At least one of the following parameters are not properly set: ECUID or ECGID!"