diff --git a/roles/koschei/templates/config.cfg.j2 b/roles/koschei/templates/config.cfg.j2
index c31054320e..2c66c2c4a1 100644
--- a/roles/koschei/templates/config.cfg.j2
+++ b/roles/koschei/templates/config.cfg.j2
@@ -13,9 +13,19 @@ config = {
         "server": "http://{{ koschei_koji_hub }}/kojihub",
         "topurl": "http://{{ koschei_kojipkgs }}",
         "weburl": "http://{{ koschei_koji_web }}/koji",
+        {% if env == 'staging' %}
+        {# upcoming config change #}
+        "login_method": "ssl_login",
+        "login_args": {
+            "cert": "/etc/koschei/koschei.pem",
+            "ca": "/etc/koschei/fedora-ca.cert",
+            "serverca": "/etc/koschei/fedora-ca.cert",
+        },
+        {% else %}
         "cert": "/etc/koschei/koschei.pem",
         "ca": "/etc/koschei/fedora-ca.cert",
         "server_ca": "/etc/koschei/fedora-ca.cert",
+        {% endif %}
         "source_tag": "{{ koschei_koji_tag }}",
         "target_tag": "{{ koschei_koji_tag }}",
         "build_tag": "{{ koschei_koji_tag }}-build",
@@ -33,7 +43,12 @@ config = {
         "keep_build_deps_for": 5,
         "local": False,
         "arches": ['x86_64', 'i386'],
+        {% if env == 'staging' %}
+        {# upcoming config change #}
+        "remote_repo": "http://{{ koschei_kojipkgs }}/repos/{build_tag}/{repo_id}/{arch}",
+        {% else %}
         "remote_repo": "http://{{ koschei_kojipkgs }}/repos/{{ koschei_koji_tag }}-build/{repo_id}/{arch}",
+        {% endif %}
         # For upcoming paraller resolver
         "cache_l1_capacity": 8,
         "cache_l2_capacity": 128,