diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml
index b79aeab01d..c59bfea2f8 100644
--- a/playbooks/manual/upgrade/bodhi.yml
+++ b/playbooks/manual/upgrade/bodhi.yml
@@ -34,7 +34,6 @@
   - 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/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index f53f03b88e..7e6c859452 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -5,7 +5,6 @@
 - name: install needed packages
   package: pkg={{ item }} state=present
   with_items:
-  - bodhi-docs
   - bodhi-server
   - libsemanage-python
   - python-psycopg2
@@ -13,6 +12,13 @@
   - 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 681b276c82..aa17def58b 100644
--- a/roles/bodhi2/base/templates/bodhi-app.conf
+++ b/roles/bodhi2/base/templates/bodhi-app.conf
@@ -1,4 +1,5 @@
-Alias /docs /usr/share/doc/bodhi-docs/html/
+{% if env == 'staging' %}
+Alias /docs /usr/share/doc/bodhi-docs-2.4.0/html/
 
 <Location /docs/>
 	Header set Cache-Control public
@@ -7,6 +8,7 @@ Alias /docs /usr/share/doc/bodhi-docs/html/
 </Location>
 
 
+{% endif %}
 Alias /static /usr/lib/python2.7/site-packages/bodhi/server/static/
 
 <Location /static/>