diff --git a/docker/bin/msfconsole-dev b/docker/bin/msfconsole-dev
new file mode 100755
index 0000000000..69cf879975
--- /dev/null
+++ b/docker/bin/msfconsole-dev
@@ -0,0 +1,27 @@
+#! /bin/bash
+
+if [[ -z "$MSF_PATH" ]]; then
+  path=`dirname $0`
+
+  # check for ./docker/msfconsole.rc
+  if [[ ! -f $path/../msfconsole.rc ]] ; then
+
+    # we are not inside the project
+    realpath --version > /dev/null 2>&1 || { echo >&2 "I couldn't find where metasploit is. Set \$MSF_PATH or execute this from the project root"; exit 1 ;}
+
+    # determine script path
+    pushd $(dirname $(realpath $0)) > /dev/null
+    path=$(pwd)
+    popd > /dev/null
+  fi
+  MSF_PATH=$(dirname $(dirname $path))
+fi
+
+cd $MSF_PATH
+
+if [[ -n "$MSF_BUILD" ]]; then
+  docker-compose -f $MSF_PATH/docker-compose.yml -f $MSF_PATH/docker/docker-compose.development.override.yml build
+fi
+
+docker-compose -f $MSF_PATH/docker-compose.yml -f $MSF_PATH/docker/docker-compose.development.override.yml run --rm --service-ports ms ./msfconsole -r docker/msfconsole.rc "$@"
+
diff --git a/docker/docker-compose.development.override.yml b/docker/docker-compose.development.override.yml
index 84157606af..84d3de535b 100644
--- a/docker/docker-compose.development.override.yml
+++ b/docker/docker-compose.development.override.yml
@@ -6,4 +6,4 @@ services:
       DATABASE_URL: postgres://postgres@db:5432/msf_dev
 
     volumes:
-      - .:/usr/src/app
+      - .:/usr/src/metasploit-framework