diff --git a/spark-k8s/stackable/run-spark.sh b/spark-k8s/stackable/run-spark.sh
index 246f91f7b..f00b5c32b 100755
--- a/spark-k8s/stackable/run-spark.sh
+++ b/spark-k8s/stackable/run-spark.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
 
+SPARK_CONTAINER_EXIT_CODE=0
+
 eval "$_STACKABLE_PRE_HOOK"
 
-/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@"
-result=$?
+cleanup() {
+    eval "$_STACKABLE_POST_HOOK"
+    exit $SPARK_CONTAINER_EXIT_CODE
+}
 
-eval "$_STACKABLE_POST_HOOK"
+trap 'cleanup' SIGTERM SIGINT
+
+/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@"
+SPARK_CONTAINER_EXIT_CODE=$?
 
-exit $result
+cleanup