diff --git a/.do/deploy.template.yaml b/.do/deploy.template.yaml
index aca304932..cc30cf531 100644
--- a/.do/deploy.template.yaml
+++ b/.do/deploy.template.yaml
@@ -10,7 +10,7 @@ spec:
       value: enabled
       scope: RUN_TIME
     git:
-      branch: develop
+      branch: fix-heroku-1-click
       repo_clone_url: https://github.com/dradis/dradis-ce.git
     name: web
     run_command: ./bin/setup
diff --git a/CHANGELOG b/CHANGELOG
index c7d8b6245..c7537d37e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
   - Upgraded gems:
     - nokogiri, rails
   - Bugs fixes:
+    - Digital Ocean: Fix one click deploy button
     - Tylium: Fix redirection when updating an issue or content block
     - Bug tracker items:
       - [item]
diff --git a/Gemfile b/Gemfile
index 135bb55cd..77e33aed9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -213,7 +213,7 @@ end
 #
 
 # Base framework classes required by other plugins
-gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'fix/template-caching'
+gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'do/add-preprovision-db'
 
 gem 'dradis-api', path: 'engines/dradis-api'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fa8383c98..d3ba12e6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/dradis/dradis-plugins.git
-  revision: e69d1f42c85f647662307019b8b492152a5c3c29
-  branch: fix/template-caching
+  revision: 3d7ab379ee8c12c22020746222d4998e128f2c17
+  branch: do/add-preprovision-db
   specs:
     dradis-plugins (4.11.0)
 
diff --git a/README.md b/README.md
index e5ab3ce76..9f42b205f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
 
 Dradis is an open-source collaboration framework, tailored to InfoSec teams.
 
-<a href="https://heroku.com/deploy?template=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.herokucdn.com/deploy/button.svg" height="40"></a>
 <a href="https://cloud.digitalocean.com/apps/new?repo=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.deploytodo.com/do-btn-blue.svg" height="40"></a>
 
 To try Dradis Community, you can deploy your own instance (you will need accounts in the cloud providers to get started).
diff --git a/app.json b/app.json
deleted file mode 100644
index ed08ea592..000000000
--- a/app.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "buildpacks": [
-    {
-      "url": "heroku-community/apt"
-    },
-    {
-      "url": "heroku/nodejs"
-    },
-    {
-      "url": "heroku/ruby"
-    }
-  ],
-  "description": "The original open-source reporting and collaboration tool trusted by InfoSec professionals around the world.",
-  "env": {
-    "RAILS_SERVE_STATIC_FILES": {
-      "description": "Ask Rails to serve static assets",
-      "value": "1"
-    }
-  },
-  "keywords": ["infosec", "pentest", "osint"],
-  "logo": "https://github.com/dradis/dradis-ce/raw/deploy-to-heroku/app/assets/images/logo_small.png",
-  "name": "Dradis Framework - Community Edition",
-  "repository": "https://github.com/dradis/dradis-ce/tree/deploy-to-heroku",
-  "scripts": {
-    "postdeploy": "bin/heroku"
-  },
-  "website": "http://drad.is"
-}
diff --git a/bin/heroku b/bin/heroku
deleted file mode 100755
index 3fd15d928..000000000
--- a/bin/heroku
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-
-# path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
-
-def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-FileUtils.chdir APP_ROOT do
-  puts "\n== Copying sample files =="
-  FileUtils.cp 'config/secrets.yml.template', 'config/secrets.yml'
-  FileUtils.cp 'config/smtp.yml.template', 'config/smtp.yml'
-
-  puts "\n== Preparing templates folder =="
-  FileUtils.mkdir 'templates'
-
-  puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
-
-  puts "\n== Loading some sample content =="
-  system! 'bundle exec thor dradis:setup:welcome'
-end
diff --git a/config/cable.yml b/config/cable.yml
index 191a39616..fdfd49f35 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -1,10 +1,11 @@
 development:
-  adapter: async
+  adapter: <%= defined?(Dradis::Pro) ? 'redis' : 'async' %>
+  url: <%= ENV.fetch('REDIS_URL') { 'redis://localhost:6379/1' } %>
 
 test:
   adapter: test
 
 production:
-  adapter: redis
-  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  adapter: <%= defined?(Dradis::Pro) ? 'redis' : 'async' %>
+  url: <%= ENV.fetch('REDIS_URL') { 'redis://localhost:6379/1' } %>
   channel_prefix: dradispro_production
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 651599da2..a79bf78b0 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -59,7 +59,7 @@
   config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+  config.cache_store = :memory_store, { size: 64.megabytes }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque