diff --git a/flytekit-java/src/main/java/org/flyte/flytekit/SdkConfig.java b/flytekit-java/src/main/java/org/flyte/flytekit/SdkConfig.java
index bf464b85..fa08c952 100644
--- a/flytekit-java/src/main/java/org/flyte/flytekit/SdkConfig.java
+++ b/flytekit-java/src/main/java/org/flyte/flytekit/SdkConfig.java
@@ -27,9 +27,9 @@
 abstract class SdkConfig {
 
   // VisibleForTesting
-  static final String DOMAIN_ENV_VAR = "FLYTE_INTERNAL_DOMAIN";
-  static final String PROJECT_ENV_VAR = "FLYTE_INTERNAL_PROJECT";
-  static final String VERSION_ENV_VAR = "FLYTE_INTERNAL_VERSION";
+  static final String DOMAIN_ENV_VAR = "FLYTE_INTERNAL_TASK_DOMAIN";
+  static final String PROJECT_ENV_VAR = "FLYTE_INTERNAL_TASK_PROJECT";
+  static final String VERSION_ENV_VAR = "FLYTE_INTERNAL_TASK_VERSION";
 
   public abstract String project();
 
diff --git a/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java b/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java
index 7123b0a6..fade887f 100644
--- a/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java
+++ b/flytekit-local-engine/src/test/java/org/flyte/localengine/LocalEngineTest.java
@@ -501,9 +501,9 @@ public static Stream<Arguments> testBranchNodesProvider() {
   private static Map<String, WorkflowTemplate> loadWorkflows() {
     Map<String, String> env =
         ImmutableMap.of(
-            "FLYTE_INTERNAL_DOMAIN", "development",
-            "FLYTE_INTERNAL_VERSION", "test",
-            "FLYTE_INTERNAL_PROJECT", "flytetester");
+            "FLYTE_INTERNAL_TASK_DOMAIN", "development",
+            "FLYTE_INTERNAL_TASK_VERSION", "test",
+            "FLYTE_INTERNAL_TASK_PROJECT", "flytetester");
 
     Map<WorkflowIdentifier, WorkflowTemplate> registrarWorkflows =
         loadAll(WorkflowTemplateRegistrar.class, env);
@@ -515,9 +515,9 @@ private static Map<String, WorkflowTemplate> loadWorkflows() {
   private static Map<String, RunnableTask> loadTasks() {
     Map<String, String> env =
         ImmutableMap.of(
-            "FLYTE_INTERNAL_DOMAIN", "development",
-            "FLYTE_INTERNAL_VERSION", "test",
-            "FLYTE_INTERNAL_PROJECT", "flytetester");
+            "FLYTE_INTERNAL_TASK_DOMAIN", "development",
+            "FLYTE_INTERNAL_TASK_VERSION", "test",
+            "FLYTE_INTERNAL_TASK_PROJECT", "flytetester");
 
     Map<TaskIdentifier, RunnableTask> registrarRunnableTasks =
         loadAll(RunnableTaskRegistrar.class, env);
diff --git a/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ExecutionConfig.java b/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ExecutionConfig.java
index 9e085bc5..9e33707d 100644
--- a/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ExecutionConfig.java
+++ b/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ExecutionConfig.java
@@ -33,9 +33,9 @@ public abstract class ExecutionConfig {
 
   public static ExecutionConfig load() {
     return ExecutionConfig.builder()
-        .project(getenv("FLYTE_INTERNAL_PROJECT"))
-        .domain(getenv("FLYTE_INTERNAL_DOMAIN"))
-        .version(getenv("FLYTE_INTERNAL_VERSION"))
+        .project(getenv("FLYTE_INTERNAL_TASK_PROJECT"))
+        .domain(getenv("FLYTE_INTERNAL_TASK_DOMAIN"))
+        .version(getenv("FLYTE_INTERNAL_TASK_VERSION"))
         .image(getenv("FLYTE_INTERNAL_IMAGE"))
         .build();
   }
diff --git a/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ProjectClosure.java b/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ProjectClosure.java
index a25cbfd9..6b5eb8da 100644
--- a/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ProjectClosure.java
+++ b/jflyte-utils/src/main/java/org/flyte/jflyte/utils/ProjectClosure.java
@@ -212,9 +212,9 @@ static ProjectClosure load(
             .put("JFLYTE_DOMAIN", config.domain())
             .put("JFLYTE_PROJECT", config.project())
             .put("JFLYTE_VERSION", config.version())
-            .put("FLYTE_INTERNAL_DOMAIN", config.domain())
-            .put("FLYTE_INTERNAL_PROJECT", config.project())
-            .put("FLYTE_INTERNAL_VERSION", config.version())
+            .put("FLYTE_INTERNAL_TASK_DOMAIN", config.domain())
+            .put("FLYTE_INTERNAL_TASK_PROJECT", config.project())
+            .put("FLYTE_INTERNAL_TASK_VERSION", config.version())
             .build();
 
     // 1. load classes, and create templates
diff --git a/jflyte/src/main/java/org/flyte/jflyte/ExecuteLocal.java b/jflyte/src/main/java/org/flyte/jflyte/ExecuteLocal.java
index e975ece7..35c91a53 100644
--- a/jflyte/src/main/java/org/flyte/jflyte/ExecuteLocal.java
+++ b/jflyte/src/main/java/org/flyte/jflyte/ExecuteLocal.java
@@ -64,9 +64,9 @@ public Integer call() {
 
     Map<String, String> env =
         ImmutableMap.of(
-            "FLYTE_INTERNAL_DOMAIN", "development",
-            "FLYTE_INTERNAL_VERSION", "test",
-            "FLYTE_INTERNAL_PROJECT", "flytetester");
+            "FLYTE_INTERNAL_TASK_DOMAIN", "development",
+            "FLYTE_INTERNAL_TASK_VERSION", "test",
+            "FLYTE_INTERNAL_TASK_PROJECT", "flytetester");
 
     Map<String, RunnableTask> runnableTasks = ExecuteLocalLoader.loadTasks(modules, env);
     Map<String, DynamicWorkflowTask> dynamicWorkflowTasks =