diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml
index 59fdcf0c13..5c8671728d 100644
--- a/playbooks/groups/packages.yml
+++ b/playbooks/groups/packages.yml
@@ -85,26 +85,8 @@
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
 
-- name: dole out the old service specific config
-  hosts: packages
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - fedmsg/base
-  - packages/web
-  - collectd/fcomm-queue
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"
-
-- name: dole out the new service specific config to staging
-  hosts: packages-stg
+- name: dole out the new service specific config
+  hosts: packages;packages-stg
   user: root
   gather_facts: True
 
diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml
index 21682bd735..79df66caea 100644
--- a/playbooks/manual/upgrade/packages.yml
+++ b/playbooks/manual/upgrade/packages.yml
@@ -38,23 +38,14 @@
     ignore_errors: true
 
   roles:
-  - role: packages/web
-    when: env != "staging"
   - role: packages3/web
-    when: env == "staging"
 
   post_tasks:
   - service: name="fedmsg-hub" state=stopped
-    when: env == "staging"
-  - service: name="fcomm-cache-worker" state=stopped
-    when: env != "staging"
   - service: name="httpd" state=stopped
   # TODO -- do any DB maintenance steps we need to do here..
   - service: name="httpd" state=started
-  - service: name="fcomm-cache-worker" state=started
-    when: env != "staging"
   - service: name="fedmsg-hub" state=started
-    when: env == "staging"
 
   - name: tell nagios to unshush
     nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}