diff --git a/.githooks/post-merge b/.githooks/post-merge
index e2195c88b1f02ad2d04b4f9d61d035bf55393897..456faa5846c974dda392ddbb505301c3bb334a1c 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -4,6 +4,7 @@ cd "$(git rev-parse --show-toplevel)"
 echo Installing Golang apps >> /dev/stderr
 go get github.com/giantswarm/semver-bump || true
 go get github.com/nishanths/license || true
+go get github.com/jmespath/jp || true
 go get sigs.k8s.io/kind || true
 echo Installing Python apps >> /dev/stderr
 python3 -m pip install --user --requirement requirements.txt
diff --git a/Documents/bin/docker-Build b/Documents/bin/docker-Build
index c97dd5f9b9d09d7af4344e478ac330cdb0945626..bcef61e2281df10be9319c3548bbec49e77ad71c 100755
--- a/Documents/bin/docker-Build
+++ b/Documents/bin/docker-Build
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -eu
-docker build -t "$(basename "$PWD" | awk "{print tolower(\$0)}" )" ./
+exec docker build -t "$(basename "$PWD" | awk "{print tolower(\$0)}" )" ./
diff --git a/Documents/bin/docker-dev b/Documents/bin/docker-dev
index 94157953304eeb64cb3d03223eefce82482646ae..84c4cac92739bfb4dbca22b292f4c54e88c586ca 100755
--- a/Documents/bin/docker-dev
+++ b/Documents/bin/docker-dev
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -eu
-docker run --rm -Pitv "$PWD:/volume" "$@"
+exec docker run --rm -Pitv "$PWD:/volume" "$@"
diff --git a/Documents/bin/docker-runit b/Documents/bin/docker-runit
index 27aa212890f436881e17669072aba80a31130034..9d4661832bc435c9fc936eb50b808d2e62c758fb 100755
--- a/Documents/bin/docker-runit
+++ b/Documents/bin/docker-runit
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -eu
-docker run --rm -it "$@"
+exec docker run --rm -it "$@"
diff --git a/requirements.txt b/requirements.txt
index daf1f0ccdfc39532c949eec5dc85eee161920e93..0b8fdb6d5c3d17c9939acd07f97a63f83789dba9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,8 @@
 ansible
 awscli
 awslogs
-#aws-shell
+aws-sam-cli
+aws-shell
 bcrypt
 boto
 boto3