diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a7634bc..462ea0cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-08-31]
+###
+- Dokku in favor of docker-compose and other modern Django tools (@pydanny) (@pydanny)
+
 ## [2015-08-30]
 ### Changed
 - Moved from Bootstrap 3 to Bootstrap 4 (@audreyr)
diff --git a/README.rst b/README.rst
index f710a2e5..f6cb01c3 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,6 @@ Features
 * Integration with Sentry_ for error logging (optional)
 * Docker support using docker-compose_ for dev and prod
 * Procfile_ for deploying to Heroku
-* Works with Dokku
 
 .. _alpha: http://blog.getbootstrap.com/2015/08/19/bootstrap-4-alpha/
 .. _Hitch: https://github.com/hitchtest/hitchtest
@@ -98,9 +97,9 @@ It prompts you for questions. Answer them::
     description [A short description of the project.]: A reddit clone.
     domain_name [example.com]: myreddit.com
     version [0.1.0]: 0.0.1
-    timezone [UTC]: 
+    timezone [UTC]:
     now [2015/01/13]: 2015/08/30
-    year [2015]: 
+    year [2015]:
     use_whitenoise [y]: n
     use_celery [n]: y
     use_maildump [n]: y
diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst
index e1df993d..b6cf2ec6 100644
--- a/{{cookiecutter.repo_name}}/README.rst
+++ b/{{cookiecutter.repo_name}}/README.rst
@@ -200,7 +200,7 @@ The testing framework runs Django, Celery (if enabled), Postgres, HitchSMTP (a m
 Deployment
 ----------
 
-We providing tools and instructions for deploying using Docker and Heroku. Dokku is also an option, but doesn't have the same amount of support.
+We providing tools and instructions for deploying using Docker and Heroku.
 
 Heroku
 ^^^^^^
@@ -344,12 +344,3 @@ To get the status, run::
 If you have errors, you can always check your stack with `docker-compose`. Switch to your projects root directory and run::
 
     docker-compose ps
-
-
-
-Dokku
-^^^^^^
-
-`Instructions for deploying with Dokku`_ can be found in the docs.
-
-.. _`Instructions for deploying with Dokku`: https://github.com/pydanny/cookiecutter-django/blob/master/%7B%7Bcookiecutter.repo_name%7D%7D/docs/deploy.rst
diff --git a/{{cookiecutter.repo_name}}/docs/dokku.rst b/{{cookiecutter.repo_name}}/docs/dokku.rst
deleted file mode 100644
index a33a95ce..00000000
--- a/{{cookiecutter.repo_name}}/docs/dokku.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-Dokku
-=====
-
-You need to make sure you have a server running Dokku with at least 1GB of RAM. Backing services are
-added just like in Heroku however you must ensure you have the relevant Dokku plugins installed.
-
-.. code-block:: bash
-
-    cd /var/lib/dokku/plugins
-    git clone https://github.com/rlaneve/dokku-link.git link
-    git clone https://github.com/luxifer/dokku-redis-plugin redis
-    git clone https://github.com/jezdez/dokku-postgres-plugin postgres
-    dokku plugins-install
-
-You can specify the buildpack you wish to use by creating a file name .env containing the following.
-
-.. code-block:: bash
-
-    export BUILDPACK_URL=<repository>
-
-You can then deploy by running the following commands.
-
-..  code-block:: bash
-
-    git remote add dokku dokku@yourservername.com:{{cookiecutter.repo_name}}
-    git push dokku master
-    ssh -t dokku@yourservername.com dokku redis:create {{cookiecutter.repo_name}}-redis
-    ssh -t dokku@yourservername.com dokku redis:link {{cookiecutter.repo_name}}-redis {{cookiecutter.repo_name}}
-    ssh -t dokku@yourservername.com dokku postgres:create {{cookiecutter.repo_name}}-postgres
-    ssh -t dokku@yourservername.com dokku postgres:link {{cookiecutter.repo_name}}-postgres {{cookiecutter.repo_name}}
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_SECRET_KEY=RANDOM_SECRET_KEY_HERE
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_SETTINGS_MODULE='config.settings.production'
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_AWS_ACCESS_KEY_ID=YOUR_AWS_ID_HERE
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY_HERE
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_AWS_STORAGE_BUCKET_NAME=YOUR_AWS_S3_BUCKET_NAME_HERE
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_MAILGUN_API_KEY=YOUR_MAILGUN_API_KEY
-    ssh -t dokku@yourservername.com dokku config:set {{cookiecutter.repo_name}} DJANGO_MAILGUN_SERVER_NAME=YOUR_MAILGUN_SERVER
-    ssh -t dokku@yourservername.com dokku run {{cookiecutter.repo_name}} python manage.py migrate
-    ssh -t dokku@yourservername.com dokku run {{cookiecutter.repo_name}} python manage.py createsuperuser
-
-When deploying via Dokku make sure you backup your database in some fashion as it is NOT done automatically.