diff --git a/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org
index a8a96e9297..f81897ebd9 100644
--- a/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/darkserver-backend01.stg.phx2.fedoraproject.org
@@ -3,8 +3,8 @@ nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
 
 eth0_ip: 10.5.126.124
 
diff --git a/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org
index 84de6c1fbe..ff57668c7d 100644
--- a/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/darkserver-web01.stg.phx2.fedoraproject.org
@@ -3,8 +3,8 @@ nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
 
 eth0_ip: 10.5.126.92
 
diff --git a/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org
index 53e921bdc6..b3c6b6f9df 100644
--- a/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/darkserver-web02.stg.phx2.fedoraproject.org
@@ -3,8 +3,8 @@ nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-26
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/26/Server/x86_64/os/
 
 eth0_ip: 10.5.126.120
 
diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index abfef709b6..391751103d 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -74,5 +74,11 @@
   - include: "{{ tasks_path }}/2fa_client.yml"
   - include: "{{ tasks_path }}/motd.yml"
 
+  - name: install skopeo for container management
+    package:
+      name: skopeo
+      state: latest
+    when: ansible_architecture != "ppc64"
+
   handlers:
   - include: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/distgit/files/fedmsg-genacls-config.py b/roles/distgit/files/fedmsg-genacls-config.py
deleted file mode 100644
index b657de1de8..0000000000
--- a/roles/distgit/files/fedmsg-genacls-config.py
+++ /dev/null
@@ -1,4 +0,0 @@
-config = {
-    'genacls.consumer.enabled': True,
-    'genacls.consumer.delay': 5, # 5 seconds
-}
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index bad9e62ba0..e30672b353 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -243,7 +243,8 @@
   - distgit
 
 - name: install the fedmsg configuration
-  copy: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py owner=root group=root mode=0644
+  template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py
+            owner=root group=root mode=0644
   tags:
   - config
   - distgit
diff --git a/roles/distgit/templates/fedmsg-genacls-config.py b/roles/distgit/templates/fedmsg-genacls-config.py
new file mode 100644
index 0000000000..58d3acaede
--- /dev/null
+++ b/roles/distgit/templates/fedmsg-genacls-config.py
@@ -0,0 +1,12 @@
+config = {
+    'genacls.consumer.enabled': True,
+    'genacls.consumer.delay': 5, # 5 seconds
+
+    # New world
+    'gitoliteprefix.consumer.enabled': True,
+    'gitoliteprefix.consumer.delay': 5, # 5 seconds
+    'gitoliteprefix.consumer.filename': '/var/tmp/gitolite-prefix.txt',
+    'gitoliteprefix.consumer.fasurl': 'https://admin.fedoraproject.org/accounts',
+    'gitoliteprefix.consumer.username': "{{ blockerbugs_fas_user }}",
+    'gitoliteprefix.consumer.password': '{{ blockerbugs_fas_password }}',
+}
diff --git a/roles/fas_client/files/aliases.template b/roles/fas_client/files/aliases.template
index 4afae1d8ac..cffbf3421e 100644
--- a/roles/fas_client/files/aliases.template
+++ b/roles/fas_client/files/aliases.template
@@ -144,7 +144,7 @@ fudcon-paper:    fudcon-cfp
 # flock
 flockpress: bex,fpl
 flockinfo: bex,fpl
-flock-staff: bex,fpl,duffy
+flock-staff: bex,fpl,duffy,sgallagh
 
 # gnome backups
 gnomebackup: backups@gnome.org
diff --git a/roles/git/hooks/files/post-receive-alternativearch b/roles/git/hooks/files/post-receive-alternativearch
index 4b23fb231f..16d8cef4dd 100755
--- a/roles/git/hooks/files/post-receive-alternativearch
+++ b/roles/git/hooks/files/post-receive-alternativearch
@@ -17,7 +17,8 @@ import sys
 from email.mime.text import MIMEText
 
 abspath = os.path.abspath(os.environ['GIT_DIR'])
-PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+%ifarch', '+%ifnarch')
+PATTERNS = ('+ExclusiveArch:', '+ExcludeArch:', '+%ifarch', '+%ifnarch',
+            '-ExclusiveArch:', '-ExcludeArch:', '-%ifarch', '-%ifnarch')
 FROM_EMAIL = 'githook-noreply@fedoraproject.org'
 TO_MAIL = 'arch-excludes@lists.fedoraproject.org'
 CGIT_URL = 'https://src.fedoraproject.org/cgit/%s/commit/?id=%s'