diff --git a/Makefile b/GNUmakefile
similarity index 100%
rename from Makefile
rename to GNUmakefile
diff --git a/vault/testing.go b/vault/testing.go
index 1f16477091..049553b79e 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -275,7 +275,7 @@ func StartSSHHostTestServer() (string, error) {
 // Used to test the SSH secret backend.
 func executeServerCommand(ch ssh.Channel, req *ssh.Request) {
 	command := string(req.Payload[4:])
-	cmd := exec.Command("/bin/bash", []string{"-c", command}...)
+	cmd := exec.Command("/bin/sh", "-c", command)
 	req.Reply(true, nil)
 
 	cmd.Stdout = ch
diff --git a/website/packer.json b/website/packer.json
index 5732112c3f..791ef58109 100644
--- a/website/packer.json
+++ b/website/packer.json
@@ -36,7 +36,7 @@
         "bundle check || bundle install --jobs 7",
         "bundle exec middleman build",
 
-        "/bin/bash ./scripts/deploy.sh"
+        "/usr/bin/env bash ./scripts/deploy.sh"
       ]
     }
   ]
diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
index 297c12fe4f..f79335953f 100755
--- a/website/scripts/deploy.sh
+++ b/website/scripts/deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 PROJECT="vault"