diff --git a/inventory/group_vars/osbs b/inventory/group_vars/osbs
index c43f5e3495..85a81fb90d 100644
--- a/inventory/group_vars/osbs
+++ b/inventory/group_vars/osbs
@@ -14,3 +14,5 @@ docker_registry: "registry.fedoraproject.org"
 
 osbs_url: "osbs.fedoraproject.org"
 osbs_koji_username: "kojibuilder"
+
+koji_url: "koji.fedoraproject.org"
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg
index 6a45854e7a..40df2ba5fd 100644
--- a/inventory/group_vars/osbs-stg
+++ b/inventory/group_vars/osbs-stg
@@ -14,3 +14,5 @@ docker_registry: "registry.stg.fedoraproject.org"
 
 osbs_url: "osbs.stg.fedoraproject.org"
 osbs_koji_username: "kojibuilder_stg"
+
+koji_url: "koji.stg.fedoraproject.org"
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index 1cc96c0f7a..c57fbaba75 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -177,12 +177,12 @@
           username: "{{ osbs_koji_stg_username }}",
           password: "{{ osbs_koji_stg_password }}",
           koji_certs_secret: "koji",
-          openshift_url: 'https://osbs.stg.fedoraproject.org/',
-          registry_uri: 'https://registry.stg.fedoraproject.org/v2',
-          source_registry_uri: 'https://registry.stg.fedoraproject.org/v2',
-          build_host: 'osbs.stg.fedoraproject.org',
-          koji_root: 'https://koji.stg.fedoraproject.org/koji',
-          koji_hub: 'https://koji.stg.fedoraproject.org/kojihub',
+          openshift_url: 'https://{{osbs_url}}/',
+          registry_uri: 'https://{{docker_registry}}/v2',
+          source_registry_uri: 'https://{{docker_registry}}/v2',
+          build_host: '{{osbs_url}}',
+          koji_root: 'https://{{koji_url}}/koji',
+          koji_hub: 'https://{{koji_url}}/kojihub',
           sources_command: 'fedpkg sources',
           build_type: 'prod',
           authoritative_registry: 'registry.example.com',
@@ -207,12 +207,12 @@
           username: "{{ osbs_koji_prod_username }}",
           password: "{{ osbs_koji_prod_password }}",
           koji_certs_secret: "koji",
-          openshift_url: 'https://osbs.fedoraproject.org:8443/',
-          registry_uri: 'https://osbs.fedoraproject.org/v2',
-          source_registry_uri: 'https://osbs.fedoraproject.org/v2',
-          build_host: 'osbs.fedoraproject.org',
-          koji_root: 'https://koji.fedoraproject.org/koji',
-          koji_hub: 'https://koji.fedoraproject.org/kojihub',
+          openshift_url: 'https://{{osbs_url}}/',
+          registry_uri: 'https://{{docker_registry}}/v2',
+          source_registry_uri: 'https://{{docker_registry}}/v2',
+          build_host: '{{osbs_url}}',
+          koji_root: 'https://{{koji_url}}/koji',
+          koji_hub: 'https://{{koji_url}}/kojihub',
           sources_command: 'fedpkg sources',
           build_type: 'prod',
           authoritative_registry: 'registry.example.com',