diff --git a/terraform-client/src/main/java/org/terrakube/terraform/ProcessLauncher.java b/terraform-client/src/main/java/org/terrakube/terraform/ProcessLauncher.java
index a7da548..aacf11d 100644
--- a/terraform-client/src/main/java/org/terrakube/terraform/ProcessLauncher.java
+++ b/terraform-client/src/main/java/org/terrakube/terraform/ProcessLauncher.java
@@ -39,6 +39,11 @@ void setDirectory(File directory) {
         assert this.process == null;
         this.builder.directory(directory);
     }
+    
+    void setRedirectErrorStream(boolean redirectErrorStream) {
+        assert this.process == null;
+        this.builder.redirectErrorStream(redirectErrorStream);
+    }
 
     void appendCommands(String... commands) {
         Stream<String> filteredCommands = Arrays.stream(commands).filter(c -> c != null && c.length() > 0);
diff --git a/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java b/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java
index 73c3574..9d14e2b 100644
--- a/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java
+++ b/terraform-client/src/main/java/org/terrakube/terraform/TerraformClient.java
@@ -41,6 +41,7 @@ public class TerraformClient implements AutoCloseable {
     private boolean inheritIO;
     private boolean showColor;
     private boolean jsonOutput;
+    private boolean redirectErrorStream;
     private String terraformVersion;
     private String backendConfig;
     private String terraformReleasesUrl;
@@ -68,7 +69,7 @@ public CompletableFuture<String> version() throws IOException {
         return launcher.launch().thenApply((c) -> c == 0 ? version.toString() : null);
     }
 
-    public CompletableFuture<Boolean> show(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> show(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         checkVarFileParam(terraformProcessData);
         checkTerraformVariablesParam(terraformProcessData);
         return this.run(
@@ -83,7 +84,7 @@ public CompletableFuture<Boolean> show() throws IOException {
         return this.run(TerraformCommand.show);
     }
 
-    public CompletableFuture<Boolean> showPlan(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> showPlan(@NonNull TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         checkVarFileParam(terraformProcessData);
         checkTerraformVariablesParam(terraformProcessData);
         return this.run(
@@ -98,7 +99,7 @@ public CompletableFuture<Boolean> showPlan() throws IOException {
         return this.run(TerraformCommand.showPlan);
     }
 
-    public CompletableFuture<Boolean> init(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> init(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         checkVarFileParam(terraformProcessData);
         checkTerraformVariablesParam(terraformProcessData);
         return this.run(
@@ -113,7 +114,7 @@ public CompletableFuture<Boolean> init() throws IOException {
         return this.run(TerraformCommand.init);
     }
 
-    public CompletableFuture<Boolean> plan(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> plan(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         return this.run(
                 terraformProcessData,
                 outputListener,
@@ -121,7 +122,7 @@ public CompletableFuture<Boolean> plan(TerraformProcessData terraformProcessData
                 TerraformCommand.plan);
     }
 
-    public CompletableFuture<Integer> planDetailExitCode(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Integer> planDetailExitCode(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         terraformProcessData.setDetailExitCode(true);
         return this.getTerraformLauncher(
                 terraformProcessData,
@@ -129,7 +130,7 @@ public CompletableFuture<Integer> planDetailExitCode(TerraformProcessData terraf
                 errorListener, TerraformCommand.plan).launch();
     }
 
-    public CompletableFuture<Boolean> statePull(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> statePull(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         return this.run(
                 terraformProcessData,
                 outputListener,
@@ -137,7 +138,7 @@ public CompletableFuture<Boolean> statePull(TerraformProcessData terraformProces
                 TerraformCommand.statePull);
     }
 
-    public CompletableFuture<Boolean> planDestroy(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> planDestroy(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         return this.run(
                 terraformProcessData,
                 outputListener,
@@ -145,7 +146,7 @@ public CompletableFuture<Boolean> planDestroy(TerraformProcessData terraformProc
                 TerraformCommand.planDestroy);
     }
 
-    public CompletableFuture<Integer> planDestroyDetailExitCode(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Integer> planDestroyDetailExitCode(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         terraformProcessData.setDetailExitCode(true);
         return this.getTerraformLauncher(
                 terraformProcessData,
@@ -158,7 +159,7 @@ public CompletableFuture<Boolean> plan() throws IOException {
         return this.run(TerraformCommand.plan);
     }
 
-    public CompletableFuture<Boolean> apply(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> apply(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         return this.run(
                 terraformProcessData,
                 outputListener,
@@ -171,7 +172,7 @@ public CompletableFuture<Boolean> apply() throws IOException {
         return this.run(TerraformCommand.apply);
     }
 
-    public CompletableFuture<Boolean> destroy(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> destroy(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         checkBackendConfigFile(terraformProcessData);
         return this.run(
                 terraformProcessData,
@@ -185,7 +186,7 @@ public CompletableFuture<Boolean> destroy() throws IOException {
         return this.run(TerraformCommand.destroy);
     }
 
-    public CompletableFuture<Boolean> output(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, @NonNull Consumer<String> errorListener) throws IOException {
+    public CompletableFuture<Boolean> output(TerraformProcessData terraformProcessData, @NonNull Consumer<String> outputListener, Consumer<String> errorListener) throws IOException {
         checkBackendConfigFile(terraformProcessData);
         checkVarFileParam(terraformProcessData);
         checkTerraformVariablesParam(terraformProcessData);
@@ -405,6 +406,7 @@ private ProcessLauncher getTerraformLauncher(TerraformProcessData terraformProce
 
         launcher.setOutputListener(outputListener);
         launcher.setErrorListener(errorListener);
+        launcher.setRedirectErrorStream(this.redirectErrorStream);
         return launcher;
     }