diff --git a/production/jaeger-production-template.yml b/production/jaeger-production-template.yml
index 4a1c51d..c069e77 100644
--- a/production/jaeger-production-template.yml
+++ b/production/jaeger-production-template.yml
@@ -54,6 +54,7 @@ items:
           app: cassandra
           jaeger-infra: cassandra-replica
       spec:
+        terminationGracePeriodSeconds: 1800
         containers:
         - name: cassandra
           image: cassandra:3.11
@@ -74,7 +75,7 @@ items:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "PID=$(pidof java) && kill $PID && while ps -p $PID > /dev/null; do sleep 1; done"]
+                command: ["/bin/sh", "-c", "nodetool drain"]
           env:
             - name: MAX_HEAP_SIZE
               value: 512M
diff --git a/travis/install-start-minikube.sh b/travis/install-start-minikube.sh
index ee5a72b..efd8e78 100755
--- a/travis/install-start-minikube.sh
+++ b/travis/install-start-minikube.sh
@@ -24,7 +24,7 @@ mkdir $HOME/.kube || true
 touch $HOME/.kube/config
 
 export KUBECONFIG=$HOME/.kube/config
-sudo -E ./minikube start --vm-driver=none --use-vendored-driver
+sudo -E ./minikube start --vm-driver=none
 
 # this for loop waits until kubectl can access the api server that minikube has created
 for i in {1..150} # timeout for 5 minutes