diff --git a/deliverables/liberty/pbr.yaml b/deliverables/_independent/pbr.yaml
similarity index 65%
rename from deliverables/liberty/pbr.yaml
rename to deliverables/_independent/pbr.yaml
index 45010e2618..389c595e01 100644
--- a/deliverables/liberty/pbr.yaml
+++ b/deliverables/_independent/pbr.yaml
@@ -2,6 +2,15 @@
 launchpad: pbr
 send-announcements-to: openstack-dev@lists.openstack.org
 releases:
+  # kilo
+  - version: 0.11.1
+    projects:
+      - repo: openstack-dev/pbr
+        hash: 6e472b4905411a39e993c81c382a27ca9c771ef5
+        highlights: >
+          This includes fixes an unguarded import or testrepository which is
+          not listed as a requirement. (LP: #1375048)
+  # liberty
   - version: 1.3.0
     projects:
       - repo: openstack-dev/pbr
@@ -26,3 +35,8 @@ releases:
     projects:
       - repo: openstack-dev/pbr
         hash: daa905cad45ea89b557b6468af021270980b9c24
+  # mitaka
+  - version: 1.8.1
+    projects:
+      - repo: openstack-dev/pbr
+        hash: 36a2bf130999f06562b5eb063e1c49ae2d6e35a7
diff --git a/deliverables/kilo/pbr.yaml b/deliverables/kilo/pbr.yaml
deleted file mode 100644
index d6c4e1cb33..0000000000
--- a/deliverables/kilo/pbr.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-launchpad: pbr
-send-announcements-to: openstack-dev@lists.openstack.org
-releases:
-  - version: 0.11.1
-    projects:
-      - repo: openstack-dev/pbr
-        hash: 6e472b4905411a39e993c81c382a27ca9c771ef5
-        highlights: >
-          This includes fixes an unguarded import or testrepository which is
-          not listed as a requirement. (LP: #1375048)
diff --git a/deliverables/mitaka/pbr.yaml b/deliverables/mitaka/pbr.yaml
deleted file mode 100644
index 230e9bcecb..0000000000
--- a/deliverables/mitaka/pbr.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-launchpad: pbr
-send-announcements-to: openstack-dev@lists.openstack.org
-include-pypi-link: yes
-releases:
-  - version: 1.8.1
-    projects:
-      - repo: openstack-dev/pbr
-        hash: 36a2bf130999f06562b5eb063e1c49ae2d6e35a7