diff --git a/config/release/tripleo-ci/master-undercloud-queens-overcloud.yml b/config/release/tripleo-ci/master-undercloud-queens-overcloud.yml
index efdfa08fb..c14066325 100644
--- a/config/release/tripleo-ci/master-undercloud-queens-overcloud.yml
+++ b/config/release/tripleo-ci/master-undercloud-queens-overcloud.yml
@@ -83,7 +83,7 @@ repos:
       - python*-tripleo-common
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-master-deps
diff --git a/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml b/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml
index 22c384817..380b9dff9 100644
--- a/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml
+++ b/config/release/tripleo-ci/master-undercloud-rocky-overcloud.yml
@@ -83,7 +83,7 @@ repos:
       - python*-tripleo-common
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-master-deps
diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml
index e6eb59fda..66ddc17d6 100644
--- a/config/release/tripleo-ci/master.yml
+++ b/config/release/tripleo-ci/master.yml
@@ -70,7 +70,7 @@ repos:
       - os-refresh-config
       - puppet-*
       - python*-tripleo*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-master-deps
diff --git a/config/release/tripleo-ci/newton.yml b/config/release/tripleo-ci/newton.yml
index 60205e974..01463fb86 100644
--- a/config/release/tripleo-ci/newton.yml
+++ b/config/release/tripleo-ci/newton.yml
@@ -58,7 +58,7 @@ repos:
       - python-tripleoclient
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   ## All other packages from newton-promoted
   - type: generic
diff --git a/config/release/tripleo-ci/ocata.yml b/config/release/tripleo-ci/ocata.yml
index 76919d91c..ded4de02c 100644
--- a/config/release/tripleo-ci/ocata.yml
+++ b/config/release/tripleo-ci/ocata.yml
@@ -61,7 +61,7 @@ repos:
       - os-refresh-config
       - puppet-*
       - python*-tripleo*
-      - python-paunch
+      - python*-paunch*
 
   ## All other packages from ocata-promoted
   - type: generic
diff --git a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
index 79c57e76a..9c4c3aab6 100644
--- a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
+++ b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml
@@ -76,7 +76,7 @@ repos:
       - python-tripleoclient
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   ## All other packages from pike-promoted
   - type: generic
diff --git a/config/release/tripleo-ci/pike.yml b/config/release/tripleo-ci/pike.yml
index 65f4d2628..aa21185da 100644
--- a/config/release/tripleo-ci/pike.yml
+++ b/config/release/tripleo-ci/pike.yml
@@ -65,7 +65,7 @@ repos:
       - os-refresh-config
       - puppet-*
       - python*-tripleo*
-      - python-paunch
+      - python*-paunch*
 
   ## All other packages from pike-promoted
   - type: generic
diff --git a/config/release/tripleo-ci/queens-undercloud-newton-overcloud.yml b/config/release/tripleo-ci/queens-undercloud-newton-overcloud.yml
index 41139ead9..dee556d5b 100644
--- a/config/release/tripleo-ci/queens-undercloud-newton-overcloud.yml
+++ b/config/release/tripleo-ci/queens-undercloud-newton-overcloud.yml
@@ -80,7 +80,7 @@ repos:
       - python-tripleoclient
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-queens-deps
diff --git a/config/release/tripleo-ci/queens-undercloud-pike-overcloud.yml b/config/release/tripleo-ci/queens-undercloud-pike-overcloud.yml
index deb1d0bcc..d1bd22625 100644
--- a/config/release/tripleo-ci/queens-undercloud-pike-overcloud.yml
+++ b/config/release/tripleo-ci/queens-undercloud-pike-overcloud.yml
@@ -87,7 +87,7 @@ repos:
       - openstack-puppet-modules
       - openstack-tripleo-ui
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-queens-deps
diff --git a/config/release/tripleo-ci/queens.yml b/config/release/tripleo-ci/queens.yml
index 7c7ea86cb..379d18789 100644
--- a/config/release/tripleo-ci/queens.yml
+++ b/config/release/tripleo-ci/queens.yml
@@ -69,7 +69,7 @@ repos:
       - os-refresh-config
       - puppet-*
       - python*-tripleo*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-queens-deps
diff --git a/config/release/tripleo-ci/rocky-undercloud-queens-overcloud.yml b/config/release/tripleo-ci/rocky-undercloud-queens-overcloud.yml
index 70fd26435..385cb991b 100644
--- a/config/release/tripleo-ci/rocky-undercloud-queens-overcloud.yml
+++ b/config/release/tripleo-ci/rocky-undercloud-queens-overcloud.yml
@@ -83,7 +83,7 @@ repos:
       - python*-tripleo-common
       - openstack-tripleo-*
       - puppet-*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-rocky-deps
diff --git a/config/release/tripleo-ci/rocky.yml b/config/release/tripleo-ci/rocky.yml
index 45fb1b9bd..084e5af8b 100644
--- a/config/release/tripleo-ci/rocky.yml
+++ b/config/release/tripleo-ci/rocky.yml
@@ -69,7 +69,7 @@ repos:
       - os-refresh-config
       - puppet-*
       - python*-tripleo*
-      - python-paunch
+      - python*-paunch*
 
   - type: generic
     reponame: delorean-rocky-deps
diff --git a/roles/repo-setup/README.md b/roles/repo-setup/README.md
index 6869e65ff..20cba33ef 100644
--- a/roles/repo-setup/README.md
+++ b/roles/repo-setup/README.md
@@ -139,7 +139,7 @@ Settings example for repositories:
               - openstack-tripleo-puppet-elements
               - openstack-tripleo-ui
               - puppet-*
-              - python-paunch
+              - python*-paunch*
             releases:
               - master