diff --git a/susemanager/src/mgr_bootstrap_data.py b/susemanager/src/mgr_bootstrap_data.py
index fbae0c4c20b8..fa508029c08a 100644
--- a/susemanager/src/mgr_bootstrap_data.py
+++ b/susemanager/src/mgr_bootstrap_data.py
@@ -157,260 +157,260 @@
 
 DATA = {
     "SLE-12-ppc64le": {
-        "PDID": 1116,
-        "BETAPDID": [1745],
+        "PDID": [1116, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/0/bootstrap/",
     },
     "SLE-12-s390x": {
-        "PDID": 1115,
-        "BETAPDID": [1746],
+        "PDID": [1115, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/0/bootstrap/",
     },
     "SLE-12-x86_64": {
-        "PDID": 1117,
-        "BETAPDID": [1747],
+        "PDID": [1117, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/0/bootstrap/",
     },
     "SLES4SAP-12-x86_64": {
-        "PDID": 1319,
-        "BETAPDID": [1747],
+        "PDID": [1319, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/0/bootstrap/",
     },
     "SLE-12-SP1-ppc64le": {
-        "PDID": 1334,
-        "BETAPDID": [1745],
+        "PDID": [1334, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/1/bootstrap/",
     },
     "SLE-12-SP1-s390x": {
-        "PDID": [1335, 1535],
-        "BETAPDID": [1746],
+        "PDID": [1335, 1535, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/1/bootstrap/",
     },
     "SLE-12-SP1-x86_64": {
-        "PDID": [1322, 1533],
-        "BETAPDID": [1747],
+        "PDID": [1322, 1533, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/1/bootstrap/",
     },
     "SLES4SAP-12-SP1-ppc64le": {
-        "PDID": 1437,
-        "BETAPDID": [1745],
+        "PDID": [1437, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/1/bootstrap/",
     },
     "SLES4SAP-12-SP1-x86_64": {
-        "PDID": 1346,
-        "BETAPDID": [1747],
+        "PDID": [1346, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/1/bootstrap/",
     },
     "RES7-x86_64": {
-        "PDID": [1251],
-        "BETAPDID": [2065],
+        "PDID": [1251, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/res/7/bootstrap/",
     },
     "SLL7-LTSS-x86_64": {
-        "PDID": [2702, 1683],
-        "BETAPDID": [2065],
+        "PDID": [2702, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/res/7/bootstrap/",
     },
     "SLL7-OL-LTSS-x86_64": {
-        "PDID": [2778, 1683],
-        "BETAPDID": [2065],
+        "PDID": [2778, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7OPT,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/res/7/bootstrap/",
     },
     "SLE-12-SP2-aarch64": {
-        "PDID": 1375,
-        "BETAPDID": [1744],
+        "PDID": [1375, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLES_RPI-12-SP2-aarch64": {
-        "PDID": 1418,
-        "BETAPDID": [1744],
+        "PDID": [1418, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLE-12-SP2-ppc64le": {
-        "PDID": [1355, 1737],
-        "BETAPDID": [1745],
+        "PDID": [1355, 1737, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLE-12-SP2-s390x": {
-        "PDID": [1356, 1738],
-        "BETAPDID": [1746],
+        "PDID": [1356, 1738, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLE-12-SP2-x86_64": {
-        "PDID": [1357, 1739],
-        "BETAPDID": [1747],
+        "PDID": [1357, 1739, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLES4SAP-12-SP2-x86_64": {
-        "PDID": 1414,
-        "BETAPDID": [1747],
+        "PDID": [1414, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLES4SAP-12-SP2-ppc64le": {
-        "PDID": 1521,
-        "BETAPDID": [1745],
+        "PDID": [1521, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/2/bootstrap/",
     },
     "SLE-12-SP3-aarch64": {
-        "PDID": [1424, 2002],
-        "BETAPDID": [1744],
+        "PDID": [1424, 2002, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLE-12-SP3-ppc64le": {
-        "PDID": [1422, 1930],
-        "BETAPDID": [1745],
+        "PDID": [1422, 1930, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLE-12-SP3-s390x": {
-        "PDID": [1423, 1931],
-        "BETAPDID": [1746],
+        "PDID": [1423, 1931, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLE-12-SP3-x86_64": {
-        "PDID": [1421, 1932],
-        "BETAPDID": [1747],
+        "PDID": [1421, 1932, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLED-12-SP3-x86_64": {
-        "PDID": [1425],
-        "BETAPDID": [1747],
+        "PDID": [1425, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": "/srv/www/htdocs/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLES4SAP-12-SP3-x86_64": {
-        "PDID": 1426,
-        "BETAPDID": [1747],
+        "PDID": [1426, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLES4SAP-12-SP3-ppc64le": {
-        "PDID": 1572,
-        "BETAPDID": [1745],
+        "PDID": [1572, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/3/bootstrap/",
     },
     "SLE-12-SP4-aarch64": {
-        "PDID": [1628, 2114],
-        "BETAPDID": [1744],
+        "PDID": [1628, 2114, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE-12-SP4-ppc64le": {
-        "PDID": [1626, 2115],
-        "BETAPDID": [1745],
+        "PDID": [1626, 2115, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE-12-SP4-s390x": {
-        "PDID": [1627, 2116],
-        "BETAPDID": [1746],
+        "PDID": [1627, 2116, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE-12-SP4-x86_64": {
-        "PDID": [1625, 2117],
-        "BETAPDID": [1747],
+        "PDID": [1625, 2117, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLED-12-SP4-x86_64": {
-        "PDID": [1629],
-        "BETAPDID": [1747],
+        "PDID": [1629, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLES4SAP-12-SP4-x86_64": {
-        "PDID": [1755],
-        "BETAPDID": [1747],
+        "PDID": [1755, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLES4SAP-12-SP4-ppc64le": {
-        "PDID": [1754],
-        "BETAPDID": [1745],
+        "PDID": [1754, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE4HPC-12-SP4-x86_64": {
-        "PDID": [1759],
-        "BETAPDID": [1747],
+        "PDID": [1759, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE4HPC-12-SP4-aarch64": {
-        "PDID": [1758],
-        "BETAPDID": [1744],
+        "PDID": [1758, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/4/bootstrap/",
     },
     "SLE-12-SP5-aarch64": {
-        "PDID": [1875],
-        "BETAPDID": [1744],
+        "PDID": [1875, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLE-12-SP5-ppc64le": {
-        "PDID": [1876],
-        "BETAPDID": [1745],
+        "PDID": [1876, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLE-12-SP5-s390x": {
-        "PDID": [1877],
-        "BETAPDID": [1746],
+        "PDID": [1877, 3046],
+        "BETAPDID": [3050],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLE-12-SP5-x86_64": {
-        "PDID": [1878],
-        "BETAPDID": [1747],
+        "PDID": [1878, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLES4SAP-12-SP5-x86_64": {
-        "PDID": [1880],
-        "BETAPDID": [1747],
+        "PDID": [1880, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLES4SAP-12-SP5-ppc64le": {
-        "PDID": [1879],
-        "BETAPDID": [1745],
+        "PDID": [1879, 3045],
+        "BETAPDID": [3049],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLE4HPC-12-SP5-x86_64": {
-        "PDID": [1873],
-        "BETAPDID": [1747],
+        "PDID": [1873, 3047],
+        "BETAPDID": [3051],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
     "SLE4HPC-12-SP5-aarch64": {
-        "PDID": [1872],
-        "BETAPDID": [1744],
+        "PDID": [1872, 3044],
+        "BETAPDID": [3048],
         "PKGLIST": PKGLIST12,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/12/5/bootstrap/",
     },
@@ -430,248 +430,242 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/4/bootstrap/",
     },
     "SLE-15-aarch64": {
-        "PDID": [1589, 2053, 1709],
-        "BETAPDID": [1925],
+        "PDID": [1589, 2053, 3052],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLE-15-ppc64le": {
-        "PDID": [1588, 2054, 1710],
-        "BETAPDID": [1926],
+        "PDID": [1588, 2054, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLE-15-s390x": {
-        "PDID": [1587, 2055, 1711],
-        "BETAPDID": [1927],
+        "PDID": [1587, 2055, 3054],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLE-15-x86_64": {
-        "PDID": [1576, 2056, 1712],
-        "BETAPDID": [1928],
+        "PDID": [1576, 2056, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLES4SAP-15-ppc64le": {
-        "PDID": [1588, 1613, 1710],
-        "BETAPDID": [1926],
+        "PDID": [1588, 1613, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLES4SAP-15-x86_64": {
-        "PDID": [1576, 1612, 1712],
-        "BETAPDID": [1928],
+        "PDID": [1576, 1612, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/0/bootstrap/",
     },
     "SLE-15-SP1-aarch64": {
-        "PDID": [1769, 1709, 2216],
-        "BETAPDID": [1925],
+        "PDID": [1769, 3052, 2216],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLE-15-SP1-ppc64le": {
-        "PDID": [1770, 1710, 2217],
-        "BETAPDID": [1926],
+        "PDID": [1770, 3053, 2217],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLE-15-SP1-s390x": {
-        "PDID": [1771, 1711, 2218],
-        "BETAPDID": [1927],
+        "PDID": [1771, 3054, 2218],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLE-15-SP1-x86_64": {
-        "PDID": [1772, 1712, 2219],
-        "BETAPDID": [1928],
-        "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
-        "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
-    },
-    "SUMA-40-PROXY-x86_64": {
-        "PDID": [1772, 1908],
-        "BETAPDID": [],
+        "PDID": [1772, 3055, 2219],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLES4SAP-15-SP1-x86_64": {
-        "PDID": [1772, 1712, 1766],
-        "BETAPDID": [1928],
+        "PDID": [1772, 3055, 1766],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLES4SAP-15-SP1-ppc64le": {
-        "PDID": [1770, 1710, 1765],
-        "BETAPDID": [1926],
+        "PDID": [1770, 3053, 1765],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/1/bootstrap/",
     },
     "SLE-15-SP2-aarch64": {
-        "PDID": [1943, 1709, 2372],
-        "BETAPDID": [1925],
+        "PDID": [1943, 3052, 2372],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLE-15-SP2-ppc64le": {
-        "PDID": [1944, 1710, 2373],
-        "BETAPDID": [1926],
+        "PDID": [1944, 3053, 2373],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLE-15-SP2-s390x": {
-        "PDID": [1945, 1711, 2374],
-        "BETAPDID": [1927],
+        "PDID": [1945, 3054, 2374],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLE-15-SP2-x86_64": {
-        "PDID": [1946, 1712, 2375],
-        "BETAPDID": [1928],
+        "PDID": [1946, 3055, 2375],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLES4SAP-15-SP2-x86_64": {
-        "PDID": [1946, 1712, 1941],
-        "BETAPDID": [1928],
+        "PDID": [1946, 3055, 1941],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLES4SAP-15-SP2-ppc64le": {
-        "PDID": [1944, 1710, 1940],
-        "BETAPDID": [1926],
+        "PDID": [1944, 3053, 1940],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/2/bootstrap/",
     },
     "SLE-15-SP3-aarch64": {
-        "PDID": [2142, 1709, 2567],
-        "BETAPDID": [1925],
+        "PDID": [2142, 3052, 2567],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLE-15-SP3-ppc64le": {
-        "PDID": [2143, 1710, 2568],
-        "BETAPDID": [1926],
+        "PDID": [2143, 3053, 2568],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLE-15-SP3-s390x": {
-        "PDID": [2144, 1711, 2569],
-        "BETAPDID": [1927],
+        "PDID": [2144, 3054, 2569],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLE-15-SP3-x86_64": {
-        "PDID": [2145, 1712, 2570],
-        "BETAPDID": [1928],
+        "PDID": [2145, 3055, 2570],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLES4SAP-15-SP3-x86_64": {
-        "PDID": [2145, 1712, 2136],
-        "BETAPDID": [1928],
+        "PDID": [2145, 3055, 2136],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLES4SAP-15-SP3-ppc64le": {
-        "PDID": [2143, 1710, 2135],
-        "BETAPDID": [1926],
+        "PDID": [2143, 3053, 2135],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/3/bootstrap/",
     },
     "SLE-15-SP4-aarch64": {
-        "PDID": [2296, 1709],
-        "BETAPDID": [1925],
+        "PDID": [2296, 3052],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/4/bootstrap/",
     },
     "SLE-15-SP4-ppc64le": {
-        "PDID": [2297, 1710],
-        "BETAPDID": [1926],
+        "PDID": [2297, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/4/bootstrap/",
     },
     "SLE-15-SP4-s390x": {
-        "PDID": [2298, 1711],
-        "BETAPDID": [1927],
+        "PDID": [2298, 3054],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/4/bootstrap/",
     },
     "SLE-15-SP4-x86_64": {
-        "PDID": [2299, 1712],
-        "BETAPDID": [1928],
+        "PDID": [2299, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/4/bootstrap/",
     },
     "SLE-15-SP5-aarch64": {
-        "PDID": [2471, 1709],
-        "BETAPDID": [1925],
+        "PDID": [2471, 3052],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/5/bootstrap/",
     },
     "SLE-15-SP5-ppc64le": {
-        "PDID": [2472, 1710],
-        "BETAPDID": [1926],
+        "PDID": [2472, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/5/bootstrap/",
     },
     "SLE-15-SP5-s390x": {
-        "PDID": [2473, 1711],
-        "BETAPDID": [1927],
+        "PDID": [2473, 3054],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/5/bootstrap/",
     },
     "SLE-15-SP5-x86_64": {
-        "PDID": [2474, 1712],
-        "BETAPDID": [1928],
+        "PDID": [2474, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/5/bootstrap/",
     },
     "SLE-15-SP6-aarch64": {
-        "PDID": [2615, 1709],
-        "BETAPDID": [1925],
+        "PDID": [2615, 3052],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/6/bootstrap/",
     },
     "SLE-15-SP6-ppc64le": {
-        "PDID": [2616, 1710],
-        "BETAPDID": [1926],
+        "PDID": [2616, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/6/bootstrap/",
     },
     "SLE-15-SP6-s390x": {
-        "PDID": [2617, 1711],
-        "BETAPDID": [1927],
+        "PDID": [2617, 3054],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/6/bootstrap/",
     },
     "SLE-15-SP6-x86_64": {
-        "PDID": [2618, 1712],
-        "BETAPDID": [1928],
+        "PDID": [2618, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/6/bootstrap/",
     },
     "SLE-15-SP7-aarch64": {
-        "PDID": [2797, 1709],
-        "BETAPDID": [1925],
+        "PDID": [2797, 3052],
+        "BETAPDID": [3056],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/7/bootstrap/",
     },
     "SLE-15-SP7-ppc64le": {
-        "PDID": [2798, 1710],
-        "BETAPDID": [1926],
+        "PDID": [2798, 3053],
+        "BETAPDID": [3057],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_PPC,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/7/bootstrap/",
     },
     "SLE-15-SP7-s390x": {
-        "PDID": [2799, 1711],
-        "BETAPDID": [1927],
+        "PDID": [2799, 3054],
+        "BETAPDID": [3058],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_Z,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/7/bootstrap/",
     },
     "SLE-15-SP7-x86_64": {
-        "PDID": [2800, 1712],
-        "BETAPDID": [1928],
+        "PDID": [2800, 3055],
+        "BETAPDID": [3059],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/sle/15/7/bootstrap/",
     },
@@ -791,12 +785,12 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/slemicro/5/5/bootstrap/",
     },
     "openSUSE-Leap-15.4-x86_64": {
-        "PDID": [2409, 1712],
+        "PDID": [2409, 3055],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/4/bootstrap/",
     },
     "openSUSE-Leap-15.4-aarch64": {
-        "PDID": [2406, 1709],
+        "PDID": [2406, 3052],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/4/bootstrap/",
     },
@@ -811,12 +805,12 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/4/bootstrap/",
     },
     "openSUSE-Leap-15.5-x86_64": {
-        "PDID": [2588, 1712],
+        "PDID": [2588, 3055],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/5/bootstrap/",
     },
     "openSUSE-Leap-15.5-aarch64": {
-        "PDID": [2585, 1709],
+        "PDID": [2585, 3052],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/5/bootstrap/",
     },
@@ -831,12 +825,12 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/5/bootstrap/",
     },
     "openSUSE-Leap-15.6-x86_64": {
-        "PDID": [2734, 1712],
+        "PDID": [2734, 3055],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/6/bootstrap/",
     },
     "openSUSE-Leap-15.6-aarch64": {
-        "PDID": [2731, 1709],
+        "PDID": [2731, 3052],
         "PKGLIST": PKGLIST15_SALT + PKGLIST15_X86_ARM,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/opensuse/15/6/bootstrap/",
     },
@@ -982,14 +976,14 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/slmicro/6/1/bootstrap/",
     },
     "centos-7-x86_64": {
-        "PDID": [-12, 1683],
-        "BETAPDID": [2065],
+        "PDID": [-12, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/centos/7/bootstrap/",
     },
     "centos-7-aarch64": {
-        "PDID": [-31, 2361],
-        "BETAPDID": [2363],
+        "PDID": [-31, 3032],
+        "BETAPDID": [3034],
         "PKGLIST": RES7 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/centos/7/bootstrap/",
     },
@@ -1036,14 +1030,14 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/centos/8/bootstrap/",
     },
     "oracle-7-x86_64": {
-        "PDID": [-14, 1683],
-        "BETAPDID": [2065],
+        "PDID": [-14, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/oracle/7/bootstrap/",
     },
     "oracle-7-aarch64": {
-        "PDID": [-28, 2361],
-        "BETAPDID": [2363],
+        "PDID": [-28, 3032],
+        "BETAPDID": [3034],
         "PKGLIST": RES7 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/oracle/7/bootstrap/",
     },
@@ -1102,14 +1096,14 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/oracle/9/bootstrap/",
     },
     "amazonlinux-2-x86_64": {
-        "PDID": [-22, 1683],
-        "BETAPDID": [2065],
+        "PDID": [-22, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/amzn/2/bootstrap/",
     },
     "amazonlinux-2-aarch64": {
-        "PDID": [-28, 2361],
-        "BETAPDID": [2363],
+        "PDID": [-28, 3032],
+        "BETAPDID": [3034],
         "PKGLIST": RES7 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/amzn/2/bootstrap/",
     },
@@ -1146,8 +1140,8 @@
         "DEST": DOCUMENT_ROOT + "/pub/repositories/amzn/2023/bootstrap/",
     },
     "RHEL7-x86_64": {
-        "PDID": [-7, 1683],
-        "BETAPDID": [2065],
+        "PDID": [-7, 3033],
+        "BETAPDID": [3035],
         "PKGLIST": RES7 + RES7_X86 + RES7REQ,
         "DEST": DOCUMENT_ROOT + "/pub/repositories/res/7/bootstrap/",
     },
diff --git a/susemanager/susemanager.changes.mcalmer.switch-to-mlmtools b/susemanager/susemanager.changes.mcalmer.switch-to-mlmtools
new file mode 100644
index 000000000000..823a2484047f
--- /dev/null
+++ b/susemanager/susemanager.changes.mcalmer.switch-to-mlmtools
@@ -0,0 +1,2 @@
+- Switch bootstrap repository data to use new
+  Multi-Linux Manager Tools