diff --git a/docker_run.sh b/docker_run.sh
index 1010917..f808c99 100755
--- a/docker_run.sh
+++ b/docker_run.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Build changes (if necessary)
-./docker_build.sh
+./run/build
 
 # Run a container
 docker run -p 0.0.0.0:21025:21025/tcp --env-file .env -v "$(pwd)/starbound_data:/steamcmd/starbound" --name starbound-server -it --rm hub.ici.de.com/starbound-server:latest
diff --git a/docker_build.sh b/run/build
similarity index 78%
rename from docker_build.sh
rename to run/build
index 3741e4d..e712ec1 100755
--- a/docker_build.sh
+++ b/run/build
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TAG="hub.ici.de.com/starbound-server:latest"
 
diff --git a/docker_build_force.sh b/run/build-force
similarity index 80%
rename from docker_build_force.sh
rename to run/build-force
index 5c612f3..62c9937 100755
--- a/docker_build_force.sh
+++ b/run/build-force
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TAG="hub.ici.de.com/starbound-server:latest"
 
diff --git a/docker_push.sh b/run/push
similarity index 82%
rename from docker_push.sh
rename to run/push
index eb65285..51ba8dc 100755
--- a/docker_push.sh
+++ b/run/push
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 TAG="hub.ici.de.com/starbound-server:latest"