diff --git a/.buildpacks b/.buildpacks
index 4b087c6e..bfcbcab9 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,4 +1,4 @@
 https://github.com/heroku/heroku-buildpack-nodejs.git
-https://github.com/mars/create-react-app-inner-buildpack.git
+https://github.com/mars/create-react-app-inner-buildpack.git#runtime-env-vars
 https://github.com/heroku/heroku-buildpack-mustache.git
 https://github.com/heroku/heroku-buildpack-static.git
diff --git a/bin/compile b/bin/compile
index ecf67285..7664b394 100644
--- a/bin/compile
+++ b/bin/compile
@@ -35,15 +35,6 @@ rm -rf $dir
 # * Install `npm build` tooling.
 export NPM_CONFIG_PRODUCTION=false
 
-# Ensure this config exists so the buildpack successfully detects
-MUSTACHE_TEMPLATES_CONF="$BUILD_DIR/mustache_templates.conf"
-if [ -f "$MUSTACHE_TEMPLATES_CONF" ]; then
-  echo 'Using existing `mustache_templates.conf`' | indent
-else
-  echo 'Writing `mustache_templates.conf` to support create-react-app' | indent
-  echo "build/index.html" > "$MUSTACHE_TEMPLATES_CONF"
-fi
-
 echo "=====> Downloading Buildpack: $url"
 
 if [[ "$url" =~ \.tgz$ ]] || [[ "$url" =~ \.tgz\? ]]; then