diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index e897cf6f27..1b6bea3455 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -123,34 +123,6 @@
 #
 # koji ssl cert for owner sync jobs below
 #
-- name: create pki dir
-  file: path=/etc/pki/pkgdb mode=700 state=directory
-
-- name: copy koji ssl cert for owner sync
-  copy: src="{{ private }}/files/pkgdb_key_and_cert.pem" dest=/etc/pki/pkgdb/pkgdb.pem mode=600
-  tags:
-  - config
-
-- name: install /etc/pki/fas/fedora-server-ca.cert file
-  copy: >
-    src="{{ private }}/files/fedora-ca.cert"
-    dest="/etc/pki/pkgdb/fedora-server-ca.cert"
-    mode=0644
-  tags:
-  - config
-
-- name: create pki dir
-  file: path=/root/.koji mode=700 state=directory
-
-- name: install koji config for root to run owner-sync
-  copy: >
-    src=koji-config
-    dest=/root/.koji/config
-    mode=0644
-  tags:
-  - config
-  - bodhi
-
 #
 # cron job that syncs packages to koji
 #
diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 6021a80200..46cd7c25d7 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -69,7 +69,6 @@ def get_options():
     for entry in opts.keys():
         if entry == 'server' or entry == 'weburl':
             pass
-        opts[entry] = os.path.expanduser(opts[entry])
     return opts
 
 if __name__ == '__main__':
@@ -145,13 +144,9 @@ if __name__ == '__main__':
 
     for arch in arches:
         if arch == "primary":
-{% if env == 'staging' %}
-            session = koji.ClientSession("https://koji.stg.fedoraproject.org/kojihub")
-{% else %}
-            session = koji.ClientSession("https://koji.fedoraproject.org/kojihub")
-{% endif %}
+            session = koji.ClientSession("https://koji{{env_suffix}}.fedoraproject.org/kojihub", {'krb_rdns': False})
         else:
-            session = koji.ClientSession("https://%s.koji.fedoraproject.org/kojihub" % arch)
+            session = koji.ClientSession("https://%s.koji.fedoraproject.org/kojihub" % arch, {'krb_rdns': False})
         try:
             session.krb_login(options['principal'], options['keytab'])
         except: