diff --git a/src/zenml/entrypoints/entrypoint.py b/src/zenml/entrypoints/entrypoint.py
index 999bd7e688e..9dad3d9e29e 100644
--- a/src/zenml/entrypoints/entrypoint.py
+++ b/src/zenml/entrypoints/entrypoint.py
@@ -15,7 +15,6 @@
 
 import argparse
 import logging
-import os
 import sys
 
 from zenml import constants
@@ -45,8 +44,7 @@ def main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument(f"--{ENTRYPOINT_CONFIG_SOURCE_OPTION}", required=True)
     args, remaining_args = parser.parse_known_args()
-    if os.environ.get(constants.ENV_ZENML_CUSTOM_SOURCE_ROOT):
-        source_utils.set_custom_source_root(source_root=os.getcwd())
+
     entrypoint_config_class = source_utils.load_and_validate_class(
         args.entrypoint_config_source,
         expected_class=BaseEntrypointConfiguration,
diff --git a/src/zenml/integrations/databricks/orchestrators/databricks_orchestrator.py b/src/zenml/integrations/databricks/orchestrators/databricks_orchestrator.py
index 4588a9dd522..15d71f5c4d1 100644
--- a/src/zenml/integrations/databricks/orchestrators/databricks_orchestrator.py
+++ b/src/zenml/integrations/databricks/orchestrators/databricks_orchestrator.py
@@ -96,7 +96,6 @@ def _validate_remote_components(
             stack: "Stack",
         ) -> Tuple[bool, str]:
             for component in stack.components.values():
-                continue  # TODO: Remove this line
                 if not component.config.is_local:
                     continue
 
diff --git a/src/zenml/utils/source_utils.py b/src/zenml/utils/source_utils.py
index 538c832d652..d2aa36dd822 100644
--- a/src/zenml/utils/source_utils.py
+++ b/src/zenml/utils/source_utils.py
@@ -38,6 +38,7 @@
     Source,
     SourceType,
 )
+from zenml.constants import ENV_ZENML_CUSTOM_SOURCE_ROOT
 from zenml.environment import Environment
 from zenml.logger import get_logger
 
@@ -57,7 +58,9 @@
     type=SourceType.BUILTIN,
 )
 
-_CUSTOM_SOURCE_ROOT: Optional[str] = None
+_CUSTOM_SOURCE_ROOT: Optional[str] = os.getenv(
+    ENV_ZENML_CUSTOM_SOURCE_ROOT, None
+)
 
 
 def load(source: Union[Source, str]) -> Any:
diff --git a/src/zenml/zen_server/routers/steps_endpoints.py b/src/zenml/zen_server/routers/steps_endpoints.py
index 3704f59c0d1..1fa820265b9 100644
--- a/src/zenml/zen_server/routers/steps_endpoints.py
+++ b/src/zenml/zen_server/routers/steps_endpoints.py
@@ -117,8 +117,8 @@ def create_run_step(
     pipeline_run = zen_store().get_run(step.pipeline_run_id)
     verify_permission_for_model(pipeline_run, action=Action.UPDATE)
 
-    step = zen_store().create_run_step(step_run=step)
-    return dehydrate_response_model(step)
+    step_response = zen_store().create_run_step(step_run=step)
+    return dehydrate_response_model(step_response)
 
 
 @router.get(