diff --git a/50kafka.yml b/50kafka.yml
index 2a3faf6a..4a57f3d3 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -14,7 +14,7 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5556"
     spec:
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 30
       containers:
       - name: metrics
         image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d
@@ -35,7 +35,7 @@ spec:
         ports:
         - containerPort: 9092
         command:
-        - sh
+        - /bin/bash
         - -c
         - >
           ./bin/kafka-server-start.sh
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index da1ba818..7b949ce6 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -15,7 +15,7 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5556"
     spec:
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 30
       containers:
       - name: metrics
         image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d
@@ -40,7 +40,7 @@ spec:
         - name: JMX_PORT
           value: "5555"
         command:
-        - sh
+        - /bin/bash
         - -c
         - >
           set -e;
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index f4f6298b..b73db298 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -15,7 +15,7 @@ spec:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5556"
     spec:
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 30
       containers:
       - name: metrics
         image: solsson/kafka-prometheus-jmx-exporter@sha256:1f7c96c287a2dbec1d909cd8f96c0656310239b55a9a90d7fd12c81f384f1f7d
@@ -40,7 +40,7 @@ spec:
         - name: JMX_PORT
           value: "5555"
         command:
-        - sh
+        - /bin/bash
         - -c
         - >
           set -e;