diff --git a/manager/catalogManager.go b/manager/catalogManager.go
index 19c804e..b5af3d5 100644
--- a/manager/catalogManager.go
+++ b/manager/catalogManager.go
@@ -3,17 +3,20 @@ package manager
 import (
 	"flag"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/rancher/rancher-catalog-service/model"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"strings"
+	"syscall"
 	"time"
-	"strconv"
+
+	"gopkg.in/yaml.v2"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/rancher/rancher-catalog-service/model"
 )
 
 var (
@@ -54,6 +57,11 @@ func SetEnv() {
 		log.Fatal(err)
 		fmt.Errorf(err)
 	}
+
+	// Shutdown when parent dies
+	if _, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, syscall.PR_SET_PDEATHSIG, uintptr(syscall.SIGTERM), 0); err != 0 {
+		log.Fatal("Failed to set parent death sinal, err")
+	}
 }
 
 func Init() {