diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst
index db74e866..15707c68 100644
--- a/doc/source/puppet.rst
+++ b/doc/source/puppet.rst
@@ -134,9 +134,9 @@ in your environment.
 
     export DIB_INSTALLTYPE_puppet_modules=source
 
-8) Source your undercloud environment RC file (perhaps via the select-cloud script). Then execute devtest_overcloud.sh using the new no-mergepy templates::
+8) Source your undercloud environment RC file (perhaps via the select-cloud script). Then execute devtest_overcloud.sh::
 
-    devtest_overcloud.sh --no-mergepy
+    devtest_overcloud.sh
 
 References
 ----------
diff --git a/scripts/devtest.sh b/scripts/devtest.sh
index ce22c616..15d04350 100755
--- a/scripts/devtest.sh
+++ b/scripts/devtest.sh
@@ -37,7 +37,7 @@ function show_options {
     echo "    --no-undercloud        -- Use the seed as the baremetal cloud to deploy the"
     echo "                              overcloud from."
     echo "    --build-only           -- Builds images but doesn't attempt to run them."
-    echo "    --no-mergepy           -- Use the standalone Heat templates."
+    echo "    --no-mergepy           -- Use the standalone Heat templates (default)."
     echo "    --debug-logging        -- Enable debug logging in the undercloud and overcloud."
     echo "                              This enables build time debug logs by setting the"
     echo "                              OS_DEBUG_LOGGING env var and also sets the Debug"
@@ -80,7 +80,11 @@ eval set -- "$TEMP"
 while true ; do
     case "$1" in
         --build-only) BUILD_ONLY=--build-only; shift 1;;
-        --no-mergepy) USE_MERGEPY=0; shift 1;;
+        --no-mergepy)
+            USE_MERGEPY=0
+            echo "Warning: --no-mergepy is the default now, option is DEPRECATED" >&2
+            shift 1
+            ;;
         --debug-logging)
             DEBUG_LOGGING=--debug-logging
             export OS_DEBUG_LOGGING="1"
diff --git a/scripts/devtest_overcloud.sh b/scripts/devtest_overcloud.sh
index ef8adcc2..75ed9367 100755
--- a/scripts/devtest_overcloud.sh
+++ b/scripts/devtest_overcloud.sh
@@ -23,7 +23,7 @@ function show_options {
     echo "      -h             -- this help"
     echo "      -c             -- re-use existing source/images if they exist."
     echo "      --build-only   -- build the needed images but don't deploy them."
-    echo "      --no-mergepy   -- use the standalone Heat templates."
+    echo "      --no-mergepy   -- use the standalone Heat templates (default)."
     echo "      --debug-logging -- Turn on debug logging in the built overcloud."
     echo "                         Sets both OS_DEBUG_LOGGING and the heat Debug parameter."
     echo "      --heat-env     -- path to a JSON heat environment file."
@@ -55,7 +55,11 @@ while true ; do
     case "$1" in
         -c) USE_CACHE=1; shift 1;;
         --build-only) BUILD_ONLY="1"; shift 1;;
-        --no-mergepy) USE_MERGEPY=0; shift 1;;
+        --no-mergepy)
+            USE_MERGEPY=0
+            echo "Warning: --no-mergepy is the default now, option is DEPRECATED" >&2
+            shift 1
+            ;;
         --debug-logging)
             DEBUG_LOGGING="1"
             export OS_DEBUG_LOGGING="1"