diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml
index c59bfea2f8..b79aeab01d 100644
--- a/playbooks/manual/upgrade/bodhi.yml
+++ b/playbooks/manual/upgrade/bodhi.yml
@@ -34,6 +34,7 @@
   - name: yum update bodhi-server packages from main repo
     yum: name="{{ item }}" state=latest
     with_items:
+     - bodhi-docs
      - bodhi-server
   - name: yum update bodhi-server packages from testing repo
     yum: name="{{ item }}" state=latest enablerepo=infrastructure-testing
diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml
index 72bc24a486..a39cd77bf6 100644
--- a/roles/apps-fp-o/files/apps.yaml
+++ b/roles/apps-fp-o/files/apps.yaml
@@ -477,7 +477,7 @@ children:
                 user_url: https://admin.fedoraproject.org/updates/user/{user}
                 source_url: https://github.com/fedora-infra/bodhi
                 bugs_url:   https://github.com/fedora-infra/bodhi/issues
-                docs_url:   http://bodhi.readthedocs.io/en/latest/
+                docs_url:   https://bodhi.fedoraproject.org/docs
                 sops:
                     - https://infrastructure.fedoraproject.org/infra/docs/bodhi.rst
                 status_mappings: ['bodhi']
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index 7e6c859452..f53f03b88e 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -5,6 +5,7 @@
 - name: install needed packages
   package: pkg={{ item }} state=present
   with_items:
+  - bodhi-docs
   - bodhi-server
   - libsemanage-python
   - python-psycopg2
@@ -12,13 +13,6 @@
   - packages
   - bodhi
 
-- name: install documentation package
-  package: pkg=bodhi-docs state=present
-  when: env == 'staging'
-  tags:
-  - packages
-  - bodhi
-
 - name: setup /etc/bodhi/ directory
   file: path=/etc/bodhi owner=root group=root mode=0755 state=directory
   tags:
diff --git a/roles/bodhi2/base/templates/bodhi-app.conf b/roles/bodhi2/base/templates/bodhi-app.conf
index 60e30ce48b..b6a665f355 100644
--- a/roles/bodhi2/base/templates/bodhi-app.conf
+++ b/roles/bodhi2/base/templates/bodhi-app.conf
@@ -1,4 +1,3 @@
-{% if env == 'staging' %}
 Include /etc/httpd/conf.d/bodhi-docs.include
 
 <Location /docs/>
@@ -8,7 +7,6 @@ Include /etc/httpd/conf.d/bodhi-docs.include
 </Location>
 
 
-{% endif %}
 Alias /static /usr/lib/python2.7/site-packages/bodhi/server/static/
 
 <Location /static/>