diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index 55aae49a84..a7ad964561 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -384,7 +384,7 @@ class openstack_project::mirror_update (
     basedir       => '/afs/.openstack.org/mirror/apt-puppetlabs',
     distributions => 'openstack_project/reprepro/distributions.apt-puppetlabs.erb',
     updates_file  => 'puppet:///modules/openstack_project/reprepro/puppetlabs-debs',
-    releases      => ['xenial', 'stretch'],
+    releases      => { 'xenial' => 'PC1 puppet5', 'stretch' => 'PC1 puppet5', 'bionic' => 'puppet5' },
   }
 
   cron { 'reprepro ubuntu puppetlabs':
diff --git a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
index ebbd5adcf5..809b18cd8f 100644
--- a/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.apt-puppetlabs.erb
@@ -1,9 +1,9 @@
-<% @releases.each do |release| -%>
+<% @releases.each do |release, components| -%>
 Origin: Puppetlabs
 Codename: <%= release %>
 Description: PuppetLabs <%= release.capitalize %> mirror
 Architectures: amd64
-Components: PC1 puppet5
+Components: <%= components %>
 Contents: .gz
 Update: puppetlabs-debs
 Log: <%= @logdir %>/ubuntu-puppetlabs-<%= release %>.log