diff --git a/core/src/main/java/cz/xtf/core/openshift/CLIUtils.java b/core/src/main/java/cz/xtf/core/openshift/CLIUtils.java
index cd4e7a18..75fd792a 100644
--- a/core/src/main/java/cz/xtf/core/openshift/CLIUtils.java
+++ b/core/src/main/java/cz/xtf/core/openshift/CLIUtils.java
@@ -44,6 +44,8 @@ public static String executeCommand(Map<String, String> environmentVariables, St
             });
 
             int result = p.waitFor();
+            // Shutdown the output and error streams
+            es.shutdown();
 
             if (result == 0) {
                 String commandOutput = out.get();