diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index c7d770c69..b04f5947e 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -31,3 +31,4 @@ data:
   enable_load_balancer: "true"
   api_port: "8080"
   ring_log_lines: "100"
+  pod_terminate_grace_period: 5m
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 1af559a68..0a5b0f99e 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -303,7 +303,7 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
 			Privileged: &privilegedMode,
 		},
 	}
-	terminateGracePeriodSeconds := int64(30)
+	terminateGracePeriodSeconds := int64(c.OpConfig.PodTerminateGracePeriod.Seconds())
 
 	podSpec := v1.PodSpec{
 		ServiceAccountName:            c.OpConfig.ServiceAccountName,
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 086d7200f..db15cc046 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -63,6 +63,8 @@ type Config struct {
 	Workers              uint32         `name:"workers" default:"4"`
 	APIPort              int            `name:"api_port" default:"8080"`
 	RingLogLines         int            `name:"ring_log_lines" default:"100"`
+
+	PodTerminateGracePeriod time.Duration `name:"pod_terminate_grace_period" default:"5m"`
 }
 
 // MustMarshal marshals the config or panics