diff --git a/Dockerfile b/Dockerfile
index 8fbab80..af98393 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,3 +60,4 @@ ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
+CMD ["./bin/rails", "server"]
diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 32e7713..dffd4ba 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -1,12 +1,8 @@
-#!/bin/sh
+#!/bin/bash -e
 
-if [ $# -eq 0 ]; then
-  # Create new or migrate existing database
+# If running the rails server then create or migrate existing database
+if [ "${*}" == "./bin/rails server" ]; then
   ./bin/rails db:prepare
-
-  # Start the server by default
-  exec bin/rails server
-else
-  # Allow other commands, like console or runner, to be called
-  exec bin/rails "$@"
 fi
+
+exec "${@}"