diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java
index 6678589..0d39ee7 100644
--- a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java
+++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java
@@ -54,7 +54,9 @@ public void stop() {
     log.debug("Stopping");
     kubeApiServerProcess.stopApiServer();
     etcdProcess.stopEtcd();
-    kubeConfig.restoreKubeConfig();
+    if (config.isUpdateKubeConfig()) {
+      kubeConfig.restoreKubeConfig();
+    }
     etcdProcess.cleanEtcdData();
     log.debug("Stopped");
   }
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/EtcdProcess.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/EtcdProcess.java
index 63e04ef..9f35528 100644
--- a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/EtcdProcess.java
+++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/EtcdProcess.java
@@ -88,7 +88,12 @@ public void stopEtcd() {
     }
     stopped = true;
     if (etcdProcess != null) {
-      etcdProcess.destroyForcibly();
+      try {
+        etcdProcess.destroyForcibly();
+        etcdProcess.waitFor();
+      } catch (InterruptedException e) {
+        throw new JenvtestException(e);
+      }
     }
     log.debug("etcd stopped");
   }
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java
index ff29546..52f2244 100644
--- a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java
+++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java
@@ -125,7 +125,9 @@ public void waitUntilDefaultNamespaceCreated() {
   private boolean ready(HttpClient client, HttpRequest request) {
     try {
       var response = client.send(request, HttpResponse.BodyHandlers.ofString());
-      log.trace("Ready Response message:{} code: {}", response.body(), response.statusCode());
+      log.debug("Ready Response message:{} code: {} Api Server Port: {}", response.body(),
+          response.statusCode(),
+          apiServerPort);
       return response.statusCode() == 200;
     } catch (ConnectException e) {
       // still want to retry
@@ -208,7 +210,12 @@ public void stopApiServer() {
     }
     stopped = true;
     if (apiServerProcess != null) {
-      apiServerProcess.destroyForcibly();
+      try {
+        apiServerProcess.destroyForcibly();
+        apiServerProcess.waitFor();
+      } catch (InterruptedException e) {
+        throw new JenvtestException(e);
+      }
     }
     log.debug("API Server stopped");
   }