diff --git a/deployment/deployment.yaml b/deployment/deployment.yaml
index b548fae..84c1721 100644
--- a/deployment/deployment.yaml
+++ b/deployment/deployment.yaml
@@ -37,6 +37,10 @@ spec:
         - image: registry.knatofs.se/go-cart-actor:latest
           name: cart-actor
           imagePullPolicy: Always
+          lifecycle:
+            preStop:
+              exec:
+                command: ["sleep", "5"]
           ports:
             - containerPort: 8080
               name: web
diff --git a/main.go b/main.go
index d45dc7b..4a63451 100644
--- a/main.go
+++ b/main.go
@@ -206,8 +206,9 @@ func main() {
 	mux.Handle("/metrics", promhttp.Handler())
 
 	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGTERM)
 	done := make(chan bool, 1)
+	signal.Notify(sigs, syscall.SIGTERM)
+
 	go func() {
 		sig := <-sigs
 		fmt.Println("Shutting down due to signal:", sig)