diff --git a/manifests/repo.pp b/manifests/repo.pp
index cea0e47eb..7db3f4471 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -5,6 +5,11 @@
   if $collectd::manage_repo {
     $osfamily_downcase = downcase($facts['os']['family'])
 
+    $real_ci_package_repo = $collectd::ci_package_repo ? {
+      'master' => $collectd::ci_package_repo,
+      default  => "collectd-${collectd::ci_package_repo}",
+    }
+
     if defined("::collectd::repo::${osfamily_downcase}") {
       require "::collectd::repo::${osfamily_downcase}"
     } else {
diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
index 247e269d8..4a14b378c 100644
--- a/manifests/repo/debian.pp
+++ b/manifests/repo/debian.pp
@@ -6,7 +6,7 @@
 
     apt::source { 'collectd-ci':
       location => 'https://pkg.ci.collectd.org/deb/',
-      repos    => "collectd-${$::collectd::ci_package_repo}",
+      repos    => $collectd::repo::real_ci_package_repo,
       key      => {
         'id'     => 'F806817DC3F5EA417F9FA2963994D24FB8543576',
         'server' => $::collectd::package_keyserver,
diff --git a/manifests/repo/redhat.pp b/manifests/repo/redhat.pp
index 3a5913158..e9948f17e 100644
--- a/manifests/repo/redhat.pp
+++ b/manifests/repo/redhat.pp
@@ -5,7 +5,7 @@
     yumrepo { 'collectd-ci':
       ensure  => present,
       enabled => '1',
-      baseurl => "https://pkg.ci.collectd.org/rpm/collectd-${::collectd::ci_package_repo}/epel-${::operatingsystemmajrelease}-${::architecture}",
+      baseurl => "https://pkg.ci.collectd.org/rpm/${collectd::repo::real_ci_package_repo}/epel-${::operatingsystemmajrelease}-${::architecture}",
       gpgkey  => 'https://pkg.ci.collectd.org/pubkey.asc',
     }