diff --git a/k8s/instance/list b/k8s/instance/list
index 202470ae..ff449411 100644
--- a/k8s/instance/list
+++ b/k8s/instance/list
@@ -1,13 +1,19 @@
 #!/bin/bash
 
-K8S_NAMESPACE="nullplatform"
+K8S_NAMESPACE=$(echo "$CONTEXT" | jq -r --arg default "$K8S_NAMESPACE" '
+  .providers["container-orchestration"].cluster.namespace // $default
+' 2>/dev/null || echo "nullplatform")
+
 LABEL_SELECTOR="nullplatform=true"
+
 if [[ -n "$APPLICATION_ID" && "$APPLICATION_ID" != "null" ]]; then
  LABEL_SELECTOR="$LABEL_SELECTOR,application_id=$APPLICATION_ID"
 fi
+
 if [[ -n "$SCOPE_ID" && "$SCOPE_ID" != "null" ]]; then
  LABEL_SELECTOR="$LABEL_SELECTOR,scope_id=$SCOPE_ID"
 fi
+
 if [[ -n "$DEPLOYMENT_ID" && "$DEPLOYMENT_ID" != "null" ]]; then
  LABEL_SELECTOR="$LABEL_SELECTOR,deployment_id=$DEPLOYMENT_ID"
 fi
diff --git a/k8s/instance/workflows/list.yaml b/k8s/instance/workflows/list.yaml
index a05c4815..6f324ff1 100644
--- a/k8s/instance/workflows/list.yaml
+++ b/k8s/instance/workflows/list.yaml
@@ -1,3 +1,5 @@
+include:
+  - "$SERVICE_PATH/values.yaml"
 steps:
   - name: build context
     type: script
diff --git a/k8s/log/workflows/log.yaml b/k8s/log/workflows/log.yaml
index 615fa6d6..0021aef7 100644
--- a/k8s/log/workflows/log.yaml
+++ b/k8s/log/workflows/log.yaml
@@ -1,3 +1,5 @@
+include:
+  - "$SERVICE_PATH/values.yaml"
 steps:
   - name: build context
     type: script
diff --git a/service/instance/entrypoint b/service/instance/entrypoint
index 7d51f9b8..b13d45a6 100755
--- a/service/instance/entrypoint
+++ b/service/instance/entrypoint
@@ -17,7 +17,7 @@ fi
 WORKFLOW_PATH="$SERVICE_PATH/instance/workflows/list.yaml"
 OVERRIDES_WORKFLOW_PATH="$OVERRIDES_WORKFLOW_PATH/instance/workflows/list.yaml"
 
-CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
+CMD="np service workflow exec --no-output --build-context --workflow $WORKFLOW_PATH"
 
 if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
   CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
diff --git a/service/log/entrypoint b/service/log/entrypoint
index d84b4ff2..7bb8cc11 100755
--- a/service/log/entrypoint
+++ b/service/log/entrypoint
@@ -3,7 +3,7 @@
 WORKFLOW_PATH="$SERVICE_PATH/log/workflows/log.yaml"
 OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/log/workflows/log.yaml"
 
-CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
+CMD="np service workflow exec --no-output --build-context --workflow $WORKFLOW_PATH"
 
 if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
   CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"