diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index b248a2c3..e06a85ba 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -117,7 +117,7 @@ Deployment
 ----------
 
 The following details how to deploy this application.
-{% if cookiecutter.use_heroku == "y" %}
+{% if cookiecutter.use_heroku.lower() == "y" %}
 
 Heroku
 ^^^^^^
@@ -129,7 +129,7 @@ See detailed `cookiecutter-django Heroku documentation`_.
 
 .. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html
 {% endif %}
-{% if cookiecutter.use_docker == "y" %}
+{% if cookiecutter.use_docker.lower() == "y" %}
 
 Docker
 ^^^^^^
@@ -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_experimental %}
+{% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' %}
 
 Elastic Beanstalk
 ~~~~~~~~~~~~~~~~~~
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 85edea05..ebfcc765 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_experimental -%}
+{% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%}
 # 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_experimental -%}
+{% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%}
 REDIS_LOCATION = "redis://{}:{}/0".format(
     env('REDIS_ENDPOINT_ADDRESS'),
     env('REDIS_PORT')