diff --git a/cookiecutter.json b/cookiecutter.json
index 2fb3bf6c9..bc741af24 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -22,5 +22,5 @@
     "js_task_runner": ["Gulp", "Grunt", "None"],
     "use_lets_encrypt": "n",
     "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"],
-    "use_elasticbeanstalk": "y"
+    "use_elasticbeanstalk_experimental": "y"
 }
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index dd6a3f07d..0736c375d 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -115,7 +115,10 @@ def remove_heroku_files():
     """
     Removes files needed for heroku if it isn't going to be used
     """
-    for filename in ["app.json", "Procfile", "requirements.txt", "runtime.txt"]:
+    filenames = ["app.json", "Procfile", "runtime.txt"]
+    if '{{ cookiecutter.use_elasticbeanstalk_experimental }}'.lower() != 'y':
+        filenames.append("requirements.txt")
+    for filename in ["app.json", "Procfile", "runtime.txt"]:
         file_name = os.path.join(PROJECT_DIRECTORY, filename)
         remove_file(file_name)
 
@@ -179,6 +182,22 @@ def remove_copying_files():
             PROJECT_DIRECTORY, filename
         ))
 
+def remove_elasticbeanstalk():
+    """
+    Removes elastic beanstalk components
+    """
+    docs_dir_location = os.path.join(PROJECT_DIRECTORY, '.ebextensions')
+    if os.path.exists(docs_dir_location):
+        shutil.rmtree(docs_dir_location)
+
+    filenames = ["ebsetenv.py", ]
+    if '{{ cookiecutter.use_heroku }}'.lower() != 'y':
+        filenames.append("requirements.txt")
+    for filename in filenames:
+        os.remove(os.path.join(
+            PROJECT_DIRECTORY, filename
+        ))
+
 # IN PROGRESS
 # def copy_doc_files(project_directory):
 #     cookiecutters_dir = DEFAULT_CONFIG['cookiecutters_dir']
@@ -258,5 +277,6 @@ if '{{ cookiecutter.use_lets_encrypt }}'.lower() == 'y' and '{{ cookiecutter.use
 if '{{ cookiecutter.open_source_license}}' != 'GPLv3':
     remove_copying_files()
 
-# 4. Copy files from /docs/ to {{ cookiecutter.project_slug }}/docs/
-# copy_doc_files(PROJECT_DIRECTORY)
+# 12. Remove Elastic Beanstalk files
+if '{{ cookiecutter.use_elasticbeanstalk_experimental }}'.lower() != 'y':
+    remove_elasticbeanstalk()
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index d2417e42d..69fe6ff50 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -138,7 +138,7 @@ See detailed `cookiecutter-django Docker documentation`_.
 
 .. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html
 {% endif %}
-{% if cookiecutter.use_elasticbeanstalk %}
+{% if cookiecutter.use_elasticbeanstalk_experimental %}
 
 Elastic Beanstalk
 ~~~~~~~~~~~~~~~~~~
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 57e00caa0..85edea053 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -177,7 +177,7 @@ TEMPLATES[0]['OPTIONS']['loaders'] = [
 
 # DATABASE CONFIGURATION
 # ------------------------------------------------------------------------------
-{% if cookiecutter.use_elasticbeanstalk -%}
+{% if cookiecutter.use_elasticbeanstalk_experimental -%}
 # Uses Amazon RDS for database hosting, which doesn't follow the Heroku-style spec
 DATABASES = {
     'default': {
@@ -197,7 +197,7 @@ DATABASES['default'] = env.db('DATABASE_URL')
 
 # CACHING
 # ------------------------------------------------------------------------------
-{% if cookiecutter.use_elasticbeanstalk -%}
+{% if cookiecutter.use_elasticbeanstalk_experimental -%}
 REDIS_LOCATION = "redis://{}:{}/0".format(
     env('REDIS_ENDPOINT_ADDRESS'),
     env('REDIS_PORT')