diff --git a/src/Runner.Worker/ExecutionContext.cs b/src/Runner.Worker/ExecutionContext.cs
index 749417e84..b7ca6d88a 100644
--- a/src/Runner.Worker/ExecutionContext.cs
+++ b/src/Runner.Worker/ExecutionContext.cs
@@ -272,7 +272,7 @@ namespace GitHub.Runner.Worker
                 return;
             }
 
-            step.ExecutionContext = Root.CreatePostChild(step.DisplayName, IntraActionState, this.GetFullyQualifiedContextName());
+            step.ExecutionContext = Root.CreatePostChild(step.DisplayName, IntraActionState, ContextName);
             Root.PostJobSteps.Push(step);
         }
 
@@ -914,7 +914,7 @@ namespace GitHub.Runner.Worker
             }
         }
 
-        private IExecutionContext CreatePostChild(string displayName, Dictionary<string, string> intraActionState, string scopeName)
+        private IExecutionContext CreatePostChild(string displayName, Dictionary<string, string> intraActionState, string contextName)
         {
             if (!_expandedForPostJob)
             {
@@ -924,7 +924,7 @@ namespace GitHub.Runner.Worker
             }
 
             var newGuid = Guid.NewGuid();
-            return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, scopeName, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
+            return CreateChild(newGuid, displayName, newGuid.ToString("N"), null, contextName, intraActionState, _childTimelineRecordOrder - Root.PostJobSteps.Count);
         }
     }
 
diff --git a/src/Runner.Worker/Variables.cs b/src/Runner.Worker/Variables.cs
index fb8458475..92100a05b 100644
--- a/src/Runner.Worker/Variables.cs
+++ b/src/Runner.Worker/Variables.cs
@@ -70,7 +70,7 @@ namespace GitHub.Runner.Worker
         public bool Retain_Default_Encoding => true;
 #endif
 
-        public bool? Step_Debug => GetBoolean(Constants.Variables.Actions.StepDebug);
+        public bool? Step_Debug => true;
 
         public string System_PhaseDisplayName => Get(Constants.Variables.System.PhaseDisplayName);