diff --git a/roles/releng/files/aarch64.branched b/roles/releng/files/aarch64.branched
index b4a58f29ad..b91e8bc76f 100644
--- a/roles/releng/files/aarch64.branched
+++ b/roles/releng/files/aarch64.branched
@@ -1,3 +1,3 @@
 # branched devel compose
 MAILTO=releng-cron@lists.fedoraproject.org
-# 10 11 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n https://pagure.io/releng.git && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildbranched $(date "+\%Y\%m\%d") arm
+15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm
diff --git a/roles/releng/files/aarch64.rawhide b/roles/releng/files/aarch64.rawhide
index e9b3f97a96..db1c7d741c 100644
--- a/roles/releng/files/aarch64.rawhide
+++ b/roles/releng/files/aarch64.rawhide
@@ -1,3 +1,3 @@
 # rawhide compose
 MAILTO=releng-cron@lists.fedoraproject.org
-15 5 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n https://pagure.io/releng.git && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") arm
+15 5 * * * root TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm
diff --git a/roles/releng/files/fedora-devel-pungi-ppc.cfg b/roles/releng/files/fedora-devel-pungi-ppc.cfg
deleted file mode 100644
index b1c58b94e6..0000000000
--- a/roles/releng/files/fedora-devel-pungi-ppc.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-config_opts['root'] = 'fedora-development-pungi-ppc'
-config_opts['target_arch'] = 'ppc'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['dist'] = 'fc9'
-config_opts['plugin_conf']['root_cache_enable'] = False
-config_opts['internal_dev_setup'] = False
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev/pts', '/dev/pts' ))
-
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-
-[static]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/repos/dist-rawhide/latest/ppc/
-cost=2
-
-[fedora]
-name=fedora
-baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/ppc/os
-"""
diff --git a/roles/releng/files/power64.branched b/roles/releng/files/power64.branched
new file mode 100644
index 0000000000..b91e8bc76f
--- /dev/null
+++ b/roles/releng/files/power64.branched
@@ -0,0 +1,3 @@
+# branched devel compose
+MAILTO=releng-cron@lists.fedoraproject.org
+15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm
diff --git a/roles/releng/files/power64.rawhide b/roles/releng/files/power64.rawhide
new file mode 100644
index 0000000000..db1c7d741c
--- /dev/null
+++ b/roles/releng/files/power64.rawhide
@@ -0,0 +1,3 @@
+# rawhide compose
+MAILTO=releng-cron@lists.fedoraproject.org
+15 5 * * * root TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout secondary-arch && LANG=en_US.UTF-8 ./nightly.sh arm
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 3981886e30..c6c65cd5df 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -142,7 +142,16 @@
     - fedora-24-compose-aarch64.cfg
     - fedora-branched-compose-aarch64.cfg
     - fedora-rawhide-compose-aarch64.cfg
-
+    - fedora-22-compose-ppc64.cfg
+    - fedora-23-compose-ppc64.cfg
+    - fedora-24-compose-ppc64.cfg
+    - fedora-branched-compose-ppc64.cfg
+    - fedora-rawhide-compose-ppc64.cfg
+    - fedora-22-compose-ppc64le.cfg
+    - fedora-23-compose-ppc64le.cfg
+    - fedora-24-compose-ppc64le.cfg
+    - fedora-branched-compose-ppc64le.cfg
+    - fedora-rawhide-compose-ppc64le.cfg
 
 # idmapd and make sure it's set to run
 - name: idmapd.conf
@@ -177,12 +186,22 @@
 # put cron job in for aarch64 branched compose
 - name: aarch64 branched compose cron
   copy: src="aarch64.branched" dest=/etc/cron.d/branched
-  when: inventory_hostname.startswith('compose-aarch64-01')
+  when: inventory_hostname.startswith('compose-ppc64le-01')
 
 # put cron job in for aarch64 rawhide compose
 - name: aarch64 rawhide compose cron
   copy: src="aarch64.rawhide" dest=/etc/cron.d/rawhide
-  when: inventory_hostname.startswith('compose-aarch64-01')
+  when: inventory_hostname.startswith('compose-ppc64le-01')
+
+# put cron job in for Power64 branched compose
+- name: power64 branched compose cron
+  copy: src="power64.branched" dest=/etc/cron.d/branched
+  when: inventory_hostname.startswith('compose-ppc64-01')
+
+# put cron job in for Power64 rawhide compose
+- name: power64 rawhide compose cron
+  copy: src="power64.rawhide" dest=/etc/cron.d/rawhide
+  when: inventory_hostname.startswith('compose-ppc64-01')
 
 # put cron job in for two-week nightly compose
 - name: twoweek compose cron
diff --git a/roles/releng/templates/fedora-22-compose-ppc64.cfg b/roles/releng/templates/fedora-22-compose-ppc64.cfg
new file mode 100644
index 0000000000..a5d0531fb5
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-ppc64.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-22-compose-ppc64'
+config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = True
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/ppc64/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/ppc64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-22-compose-ppc64le.cfg b/roles/releng/templates/fedora-22-compose-ppc64le.cfg
new file mode 100644
index 0000000000..146ca13735
--- /dev/null
+++ b/roles/releng/templates/fedora-22-compose-ppc64le.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-22-compose-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = True
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/22/Everything/ppc64le/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f22-build/latest/ppc64le
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-23-compose-ppc64.cfg b/roles/releng/templates/fedora-23-compose-ppc64.cfg
new file mode 100644
index 0000000000..01734157d5
--- /dev/null
+++ b/roles/releng/templates/fedora-23-compose-ppc64.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-23-compose-ppc64'
+config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = True
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/ppc64/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/ppc64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-23-compose-ppc64le.cfg b/roles/releng/templates/fedora-23-compose-ppc64le.cfg
new file mode 100644
index 0000000000..85ef7a0bd6
--- /dev/null
+++ b/roles/releng/templates/fedora-23-compose-ppc64le.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-23-compose-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = True
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://infrastructure.fedoraproject.org/pub/fedora-secondary/releases/23/Everything/ppc64le/os/
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f23-build/latest/ppc64le
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-24-compose-ppc64.cfg b/roles/releng/templates/fedora-24-compose-ppc64.cfg
new file mode 100644
index 0000000000..dbcacda03a
--- /dev/null
+++ b/roles/releng/templates/fedora-24-compose-ppc64.cfg
@@ -0,0 +1,35 @@
+config_opts['root'] = 'fedora-24-compose-ppc64'
+config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-24-compose-ppc64le.cfg b/roles/releng/templates/fedora-24-compose-ppc64le.cfg
new file mode 100644
index 0000000000..c9f3e23a4c
--- /dev/null
+++ b/roles/releng/templates/fedora-24-compose-ppc64le.cfg
@@ -0,0 +1,35 @@
+config_opts['root'] = 'fedora-24-compose-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64le/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64le
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-branched-compose-ppc64.cfg b/roles/releng/templates/fedora-branched-compose-ppc64.cfg
new file mode 100644
index 0000000000..7d4e9f9027
--- /dev/null
+++ b/roles/releng/templates/fedora-branched-compose-ppc64.cfg
@@ -0,0 +1,35 @@
+config_opts['root'] = 'fedora-branched-compose-ppc64'
+config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-branched-compose-ppc64le.cfg b/roles/releng/templates/fedora-branched-compose-ppc64le.cfg
new file mode 100644
index 0000000000..1bd6d97ccc
--- /dev/null
+++ b/roles/releng/templates/fedora-branched-compose-ppc64le.cfg
@@ -0,0 +1,35 @@
+config_opts['root'] = 'fedora-branched-compose-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/compose/branched/latest-Fedora-/compose/Everything/ppc64le/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/f24-build/latest/ppc64le
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg b/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg
new file mode 100644
index 0000000000..d4fc2ff33f
--- /dev/null
+++ b/roles/releng/templates/fedora-rawhide-compose-ppc64.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-rawhide-compose-ppc64'
+config_opts['target_arch'] = 'ppc64'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/mash/rawhide/ppc64/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/ppc64
+enabled=1
+#cost=2000
+"""
diff --git a/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg b/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg
new file mode 100644
index 0000000000..3e93f41069
--- /dev/null
+++ b/roles/releng/templates/fedora-rawhide-compose-ppc64le.cfg
@@ -0,0 +1,34 @@
+config_opts['root'] = 'fedora-rawhide-compose-ppc64le'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build vim-enhanced pungi'
+config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['internal_dev_setup'] = False
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/dev', '/dev' ))
+config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/mnt/koji', '/mnt/koji' ))
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+
+# repos
+
+[fedora]
+name=fedora
+baseurl=https://{{kojipkgs_url}}/mash/rawhide/ppc64le/os
+enabled=1
+cost=5000
+
+[static]
+name=static
+baseurl=https://{{kojipkgs_url}}/repos/rawhide/latest/ppc64le
+enabled=1
+#cost=2000
+"""