diff --git a/inventory/host_vars/209.132.184.137 b/inventory/host_vars/209.132.184.137
index ec885f12ad..0da1a443fe 100644
--- a/inventory/host_vars/209.132.184.137
+++ b/inventory/host_vars/209.132.184.137
@@ -1,11 +1,11 @@
 ---
 instance_type: m1.xlarge
-image: "{{ el7b_qcow_id }}"
+image: "{{ el7_qcow_id }}"
 keypair: fedora-admin-20130801
 security_group: jenkins
 zone: nova
-hostbase: jenkins-el7b
+hostbase: jenkins-el7
 public_ip: 209.132.184.137
 root_auth_users: pingou
-description: jenkins el7b worker/slave
+description: jenkins el7 worker/slave
 freezes: false
diff --git a/inventory/inventory b/inventory/inventory
index 2466e63a4e..26098c5dd4 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -644,7 +644,7 @@ koschei.cloud.fedoraproject.org
 209.132.184.165
 # F20 builder
 209.132.184.209
-# RHEL7beta builder
+# RHEL7 builder
 209.132.184.137
 
 [jenkins-cloud]
diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml
index 8cbb399879..06f8ae3a1b 100644
--- a/playbooks/groups/jenkins-cloud.yml
+++ b/playbooks/groups/jenkins-cloud.yml
@@ -45,7 +45,7 @@
     - vim
     - dejavu-s\*
     - fontconfig
-    - java-1.6.0-openjdk
+    - java-1.8.0-openjdk
     - httpd
     - openssh-clients
     - git
@@ -310,8 +310,8 @@
     action: yum state=installed pkg={{ item }}
     with_items:
     - vim
-    - java-1.7.0-openjdk
-    - java-1.7.0-openjdk-devel
+    - java-1.8.0-openjdk
+    - java-1.8.0-openjdk-devel
     - subversion
     - bzr
     - git
diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman-stg b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
similarity index 99%
rename from roles/base/files/postfix/main.cf/main.cf.mailman-stg
rename to roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
index 2b3291923b..97f4ecec2c 100644
--- a/roles/base/files/postfix/main.cf/main.cf.mailman-stg
+++ b/roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
@@ -93,8 +93,8 @@ mail_owner = postfix
 #myorigin = $myhostname
 #myorigin = $mydomain
 
-mydomain = fedoraproject.org
-myorigin = fedoraproject.org
+mydomain = stg.fedoraproject.org
+myorigin = stg.fedoraproject.org
 
 # RECEIVING MAIL
 
@@ -156,8 +156,7 @@ inet_interfaces = all
 #
 # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
 #
-mydestination = $myhostname, lists.stg.fedoraproject.org,
-                localhost.$mydomain, localhost
+mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost, lists.stg.fedoraproject.org,
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
 #	mail.$mydomain, www.$mydomain, ftp.$mydomain
@@ -314,7 +313,7 @@ unknown_local_recipient_reject_code = 550
 #relayhost = [mailserver.isp.tld]
 #relayhost = uucphost
 #relayhost = [an.ip.add.ress]
-relayhost =  bastion.phx2.fedoraproject.org
+relayhost = bastion.phx2.fedoraproject.org
 
 
 # REJECTING UNKNOWN RELAY USERS
@@ -680,12 +679,12 @@ sample_directory = /usr/share/doc/postfix-2.4.5/samples
 #
 readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES
 
+smtp_host_lookup = native,dns
+
 # add this to new postfix to get it to add proper message-id and other 
 # headers to outgoing emails via the gateway. 
 
-
 message_size_limit = 20971520
-#inet_protocols = ipv4
 
 
 # Mailman, see MTA.rst
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index 909f163b1c..1ab18497ea 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -129,6 +129,7 @@
 
 - name: copy delete-forgotten-instances.cron
   copy: src="delete-forgotten-instances.cron" dest=/etc/cron.daily/delete-forgotten-instances owner=root group=root mode=755
+  when: not devel
 
 - name: add  sign machine address into the  sign.conf
   lineinfile: "dest=/etc/sign.conf regexp='^server' line='server: {{ signer_host }}'"
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
index 270458e594..da18472f96 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
@@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/armhfp/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp/
 """
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
index 28ce560705..6bfffb4923 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
@@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/
 """
diff --git a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
index d6b9a892a1..56caf8b46e 100644
--- a/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
+++ b/roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
@@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
 
 [buildroot]
 name=buildroot
-baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/
+baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64/
 """
diff --git a/roles/mailman/files/pg-give-rights.py b/roles/mailman/files/pg-give-rights.py
index ea795f20fc..0da1455404 100755
--- a/roles/mailman/files/pg-give-rights.py
+++ b/roles/mailman/files/pg-give-rights.py
@@ -59,7 +59,7 @@ def main():
 
     # KittyStore
     dbspec = re.match("""
-        postgres://
+        postgresql://
         (?P<user>[a-z]+)
         :
         (?P<password>[^@]+)
diff --git a/roles/mailman/templates/mailman.cfg.j2 b/roles/mailman/templates/mailman.cfg.j2
index a90d716686..9005b85d5c 100644
--- a/roles/mailman/templates/mailman.cfg.j2
+++ b/roles/mailman/templates/mailman.cfg.j2
@@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid
 
 [database]
 class: mailman.database.postgresql.PostgreSQLDatabase
-url: postgres://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman
+url: postgresql://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman
 
 [archiver.hyperkitty]
 class: hyperkitty.archiver.Archiver
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index c539ac03ec..f6eaffef7e 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives'
 USE_INTERNAL_AUTH = False
 
 # URL to the KittyStore database
-KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore'
+KITTYSTORE_URL = 'postgresql://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore'
 # Path to the KittyStore search index (writable directory)
 KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index'
 
diff --git a/roles/mailman/templates/settings_admin.py.j2 b/roles/mailman/templates/settings_admin.py.j2
index 161bdb81e2..92e9755a86 100644
--- a/roles/mailman/templates/settings_admin.py.j2
+++ b/roles/mailman/templates/settings_admin.py.j2
@@ -21,4 +21,4 @@ DATABASES = {
         'PORT': '',
     }
 }
-KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'
+KITTYSTORE_URL = 'postgresql://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'