diff --git a/modules/openstack_project/files/reprepro/debian-security-updates b/modules/openstack_project/files/reprepro/debian-security-updates
index 1b9152f184..bffeb5bca9 100644
--- a/modules/openstack_project/files/reprepro/debian-security-updates
+++ b/modules/openstack_project/files/reprepro/debian-security-updates
@@ -3,4 +3,4 @@ Method: http://security.debian.org/
 Suite: */updates
 Architectures: amd64 arm64
 GetInRelease: no
-VerifyRelease: EDA0D2388AE22BA9|4DFAB270CAA96DFA
+VerifyRelease: EDA0D2388AE22BA9+|4DFAB270CAA96DFA+
diff --git a/modules/openstack_project/files/reprepro/debian-updates b/modules/openstack_project/files/reprepro/debian-updates
new file mode 100644
index 0000000000..773bdbc43f
--- /dev/null
+++ b/modules/openstack_project/files/reprepro/debian-updates
@@ -0,0 +1,7 @@
+Name: debian
+Method: http://ftp.us.debian.org/debian/
+Components: main
+UDebComponents: main
+Architectures: amd64 arm64 source
+GetInRelease: no
+VerifyRelease: 7638D0442B90D010+|E0B11894F66AEC98+|DC30D7C23CBBABEE+
diff --git a/modules/openstack_project/files/reprepro/debuntu-updates b/modules/openstack_project/files/reprepro/ubuntu-updates
similarity index 78%
rename from modules/openstack_project/files/reprepro/debuntu-updates
rename to modules/openstack_project/files/reprepro/ubuntu-updates
index a280909a6b..dd61cb607f 100644
--- a/modules/openstack_project/files/reprepro/debuntu-updates
+++ b/modules/openstack_project/files/reprepro/ubuntu-updates
@@ -29,11 +29,3 @@ UDebComponents: main
 Architectures: arm64 source
 GetInRelease: no
 VerifyRelease: 437D05B5|C0B21F32
-
-Name: debian
-Method: http://ftp.us.debian.org/debian/
-Components: main
-UDebComponents: main
-Architectures: amd64 arm64 source
-GetInRelease: no
-VerifyRelease: 7638D0442B90D010+|E0B11894F66AEC98+|DC30D7C23CBBABEE+
diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp
index 72dfaa3377..dc1b754844 100644
--- a/modules/openstack_project/manifests/mirror_update.pp
+++ b/modules/openstack_project/manifests/mirror_update.pp
@@ -62,7 +62,7 @@ class openstack_project::mirror_update (
     confdir            => '/etc/reprepro/debian',
     basedir            => '/afs/.openstack.org/mirror/debian',
     distributions      => 'openstack_project/reprepro/distributions.debian.erb',
-    updates_file       => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
+    updates_file       => 'puppet:///modules/openstack_project/reprepro/debian-updates',
     releases           => ['stretch', 'buster'],
     skip_backports_for => [''],
   }
@@ -111,7 +111,7 @@ class openstack_project::mirror_update (
 
 
   # Note debian-security needs it's own mirroring process, as we found
-  # that including it in the main "debuntu-updates" config lead to
+  # that including it in the main "debian-updates" config lead to
   # weird conflicts of package names breaking the mirror.
   ::openstack_project::reprepro { 'debian-security-reprepro-mirror':
     confdir       => '/etc/reprepro/debian-security',
@@ -155,7 +155,7 @@ class openstack_project::mirror_update (
     confdir       => '/etc/reprepro/ubuntu',
     basedir       => '/afs/.openstack.org/mirror/ubuntu',
     distributions => 'openstack_project/reprepro/distributions.ubuntu.erb',
-    updates_file  => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
+    updates_file  => 'puppet:///modules/openstack_project/reprepro/ubuntu-updates',
     releases      => ['bionic', 'trusty', 'xenial'],
   }
 
@@ -177,7 +177,7 @@ class openstack_project::mirror_update (
     confdir       => '/etc/reprepro/ubuntu-ports',
     basedir       => '/afs/.openstack.org/mirror/ubuntu-ports',
     distributions => 'openstack_project/reprepro/distributions.ubuntu-ports.erb',
-    updates_file  => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
+    updates_file  => 'puppet:///modules/openstack_project/reprepro/ubuntu-updates',
     releases      => ['bionic', 'xenial'],
   }
 
diff --git a/modules/openstack_project/templates/reprepro/distributions.debian.erb b/modules/openstack_project/templates/reprepro/distributions.debian.erb
index 06e74315e8..5c72959226 100644
--- a/modules/openstack_project/templates/reprepro/distributions.debian.erb
+++ b/modules/openstack_project/templates/reprepro/distributions.debian.erb
@@ -1,7 +1,5 @@
 <% @releases.each do |release| -%>
 Origin: Debian
-Label: Debian
-Suite: stable
 Codename: <%= release %>
 Description: OpenStack Debian <%= release.capitalize %> mirror
 Architectures: amd64 arm64 source
@@ -12,8 +10,6 @@ Update: debian
 Log: <%= @logdir %>/debian-<%= release %>.log
 
 Origin: Debian
-Label: Debian
-Suite: stable-updates
 Codename: <%= release %>-updates
 Description: OpenStack Debian <%= release.capitalize %> Updates mirror
 Architectures: amd64 arm64 source
@@ -25,8 +21,6 @@ Log: <%= @logdir %>/debian-<%= release %>-updates.log
 
 <% if not @skip_backports_for.include?(release) %>
 Origin: Debian Backports
-Label: Debian Backports
-Suite: <%= release %>-backports
 Codename: <%= release %>-backports
 NotAutomatic: yes
 ButAutomaticUpgrades: yes