diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs
index 8663e9340..4ac0e96b6 100644
--- a/src/Runner.Worker/Container/DockerCommandManager.cs
+++ b/src/Runner.Worker/Container/DockerCommandManager.cs
@@ -197,7 +197,8 @@ namespace GitHub.Runner.Worker.Container
 
             dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}");
             dockerOptions.Add($"--rm");
-
+            dockerOptions.Add($"-t");
+            
             foreach (var env in container.ContainerEnvironmentVariables)
             {
                 // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing
diff --git a/src/Runner.Worker/Handlers/StepHost.cs b/src/Runner.Worker/Handlers/StepHost.cs
index 0907eaed2..83c70b8e4 100644
--- a/src/Runner.Worker/Handlers/StepHost.cs
+++ b/src/Runner.Worker/Handlers/StepHost.cs
@@ -182,7 +182,7 @@ namespace GitHub.Runner.Worker.Handlers
             dockerCommandArgs.Add($"exec");
 
             // [OPTIONS]
-            dockerCommandArgs.Add($"-i");
+            dockerCommandArgs.Add($"-it");
             dockerCommandArgs.Add($"--workdir {workingDirectory}");
             foreach (var env in environment)
             {