Merge branch 'fix/local-collector-env-override' into dockerify

Author: anomit

configure-environment.sh

@@ -947,11 +947,11 @@ main() {
         exit 1
     fi
 
-    # Set default optional variables
-    set_default_optional_variables "$ENV_FILE_PATH"
-    
     # Source the environment file to ensure all variables are available for validation
     source "$ENV_FILE_PATH"
+
+    # Set default optional variables
+    set_default_optional_variables "$ENV_FILE_PATH"
 
     # Validate environment
     validate_environment