diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng-compose
index 451d5aad90..4629be1d5d 100644
--- a/inventory/group_vars/releng-compose
+++ b/inventory/group_vars/releng-compose
@@ -7,3 +7,4 @@ sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 # For the mock config
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
+kojihub_scheme: https
diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org
index 61443cd6fb..bfe9b94b91 100644
--- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org
+++ b/inventory/host_vars/branched-composer.phx2.fedoraproject.org
@@ -6,6 +6,7 @@ volgroup: /dev/vg_bvirthost08
 
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
+kojihub_scheme: https
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
index 87d1160b71..529bd02403 100644
--- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
+++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org
@@ -34,5 +34,6 @@ fas_client_groups: sysadmin-noc,sysadmin-releng
 
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
+kojihub_scheme: https
 
 nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org
index 940f852889..fb1d7985e0 100644
--- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org
@@ -14,6 +14,7 @@ fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-fedimg
 
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.stg.fedoraproject.org/kojihub
+kojihub_scheme: http
 
 nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4
 
diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
index 56db2a45bc..a0d17a6526 100644
--- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
+++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
@@ -5,6 +5,7 @@ volgroup: /dev/vg_bvirthost06
 
 kojipkgs_url: kojipkgs.fedoraproject.org
 kojihub_url: koji.fedoraproject.org/kojihub
+kojihub_scheme: https
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
 fedmsg_certs:
diff --git a/roles/releng/templates/mash.conf b/roles/releng/templates/mash.conf
index 2e2736e67a..3be70160de 100644
--- a/roles/releng/templates/mash.conf
+++ b/roles/releng/templates/mash.conf
@@ -1,6 +1,6 @@
 [defaults]
 configdir = /etc/mash
-buildhost = https://{{kojihub_url}}
+buildhost = {{kojihub_scheme}}://{{kojihub_url}}
 repodir = file:///mnt/koji
 use_sqlite = True
 use_repoview = False