diff --git a/py3-build.yaml b/py3-build.yaml
index 91f6c0639bd..1938b6e13f7 100644
--- a/py3-build.yaml
+++ b/py3-build.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-build
   version: 1.2.1
-  epoch: 3
+  epoch: 4
   description: A simple, correct Python build frontend
   copyright:
     - license: MIT
@@ -23,6 +23,7 @@ environment:
     packages:
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base
diff --git a/py3-flit-scm.yaml b/py3-flit-scm.yaml
index eb0d32d3c3d..e3bfa8abe92 100644
--- a/py3-flit-scm.yaml
+++ b/py3-flit-scm.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-flit-scm
   version: 1.7.0
-  epoch: 0
+  epoch: 1
   description: "A PEP 518 build backend that uses setuptools_scm and flit_core"
   copyright:
     - license: MIT
@@ -24,6 +24,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-packaging
       - py3-supported-pip
       - py3-supported-python
diff --git a/py3-gpep517.yaml b/py3-gpep517.yaml
index 9f81c81cd8a..2c161cbe543 100644
--- a/py3-gpep517.yaml
+++ b/py3-gpep517.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-gpep517
   version: "16"
-  epoch: 1
+  epoch: 2
   description: "PEP517 build system support for distros"
   copyright:
     - license: MIT
@@ -23,6 +23,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - py3-supported-setuptools
diff --git a/py3-packaging.yaml b/py3-packaging.yaml
index 1c6bf6d37a4..c18238edb87 100644
--- a/py3-packaging.yaml
+++ b/py3-packaging.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-packaging
   version: "24.1"
-  epoch: 1
+  epoch: 2
   description: "core utilities for python3 packaging"
   copyright:
     - license: Apache-2.0 AND BSD-2-Clause
@@ -24,6 +24,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base
diff --git a/py3-pathspec.yaml b/py3-pathspec.yaml
index 12f5bea18d3..67ee58c7b81 100644
--- a/py3-pathspec.yaml
+++ b/py3-pathspec.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pathspec
   version: 0.12.1
-  epoch: 2
+  epoch: 3
   description: "Utility library for gitignore style pattern matching of file paths"
   copyright:
     - license: MPL-2.0
@@ -23,6 +23,7 @@ environment:
     packages:
       - build-base
       - busybox
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
 
diff --git a/py3-pip-noflit.yaml b/py3-pip-noflit.yaml
deleted file mode 100644
index 4159fd220d1..00000000000
--- a/py3-pip-noflit.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-package:
-  name: py3-pip-noflit
-  version: 24.1.2
-  epoch: 0
-  description: The PyPA recommended tool for installing Python packages.
-  copyright:
-    - license: MIT
-  dependencies:
-    provider-priority: 0
-
-vars:
-  pypi-package: pip
-
-data:
-  - name: py-versions
-    items:
-      3.10: "310"
-      3.11: "311"
-      3.12: "312"
-
-environment:
-  contents:
-    packages:
-      - build-base
-      - busybox
-      - py3-supported-python
-
-pipeline:
-  - uses: git-checkout
-    with:
-      repository: https://github.com/pypa/pip
-      expected-commit: 76e82a43f8fb04695e834810df64f2d9a2ff6020
-      tag: ${{package.version}}
-
-subpackages:
-  - range: py-versions
-    # Historically py3.X-pip installed /usr/bin/pip
-    # Hence co-installable modules only package is called -base
-    # And /usr/bin/pip conflicting package is called py3.X-pip
-    name: py${{range.key}}-${{vars.pypi-package}}-noflit-base
-    description: ${{vars.pypi-package}} installed for python${{range.key}}
-    pipeline:
-      - uses: py/pip-build-install-bootstrap
-        with:
-          python: python${{range.key}}
-    dependencies:
-      runtime:
-        - py${{range.key}}-setuptools
-
-  - range: py-versions
-    name: py${{range.key}}-${{vars.pypi-package}}-noflit
-    description: Executable binaries for ${{vars.pypi-package}} installed for python${{range.key}}
-    dependencies:
-      runtime:
-        - py${{range.key}}-${{vars.pypi-package}}-noflit-base
-      provides:
-        - py3-${{vars.pypi-package}}
-      provider-priority: ${{range.value}}
-    pipeline:
-      - runs: |
-          mkdir -p ${{targets.contextdir}}/usr/bin
-          mv ${{targets.contextdir}}/../py${{range.key}}-${{vars.pypi-package}}-noflit-base/usr/bin/pip ${{targets.contextdir}}/usr/bin/
-          mv ${{targets.contextdir}}/../py${{range.key}}-${{vars.pypi-package}}-noflit-base/usr/bin/pip3 ${{targets.contextdir}}/usr/bin/
-
-  - name: py3-supported-${{vars.pypi-package}}-noflit
-    description: meta package providing ${{vars.pypi-package}}-noflit for supported python versions.
-    dependencies:
-      runtime:
-        - py3.12-${{vars.pypi-package}}-noflit-base
-        - py3.11-${{vars.pypi-package}}-noflit-base
-        - py3.10-${{vars.pypi-package}}-noflit-base
-
-update:
-  ignore-regex-patterns:
-    - b
-  enabled: true
-  shared: true
-  github:
-    identifier: pypa/pip
-    use-tag: true
diff --git a/py3-pip.yaml b/py3-pip.yaml
index b7e44a998f6..b84fea9acc3 100644
--- a/py3-pip.yaml
+++ b/py3-pip.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pip
   version: 24.1.2
-  epoch: 0
+  epoch: 1
   description: The PyPA recommended tool for installing Python packages.
   copyright:
     - license: MIT
@@ -45,7 +45,6 @@ subpackages:
           python: python${{range.key}}
     dependencies:
       runtime:
-        - py${{range.key}}-flit-core
         - py${{range.key}}-setuptools
 
   - range: py-versions
diff --git a/py3-pyparsing.yaml b/py3-pyparsing.yaml
index 0a251bccc9a..816496ae49f 100644
--- a/py3-pyparsing.yaml
+++ b/py3-pyparsing.yaml
@@ -2,7 +2,7 @@
 package:
   name: py3-pyparsing
   version: 3.1.2
-  epoch: 3
+  epoch: 4
   description: pyparsing module - Classes and methods to define and execute parsing grammars
   copyright:
     - license: MIT
@@ -25,6 +25,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base
diff --git a/py3-pyproject-hooks.yaml b/py3-pyproject-hooks.yaml
index c9b93fe3ddd..77580037295 100644
--- a/py3-pyproject-hooks.yaml
+++ b/py3-pyproject-hooks.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pyproject-hooks
   version: 1.1.0
-  epoch: 2
+  epoch: 3
   description: A low-level library for calling build-backends in `pyproject.toml`-based project
   copyright:
     - license: MIT
@@ -24,6 +24,7 @@ environment:
     packages:
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base
diff --git a/py3-pyproject-metadata.yaml b/py3-pyproject-metadata.yaml
index 0b5093863f6..787bf91c0fa 100644
--- a/py3-pyproject-metadata.yaml
+++ b/py3-pyproject-metadata.yaml
@@ -1,7 +1,7 @@
 package:
   name: py3-pyproject-metadata
   version: 0.8.0
-  epoch: 0
+  epoch: 1
   description: PEP 621 metadata parsing
   copyright:
     - license: MIT
@@ -25,6 +25,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-pip
       - py3-supported-python
       - wolfi-base
diff --git a/py3-typing-extensions.yaml b/py3-typing-extensions.yaml
index 01c8bbff4c3..42caf535f31 100644
--- a/py3-typing-extensions.yaml
+++ b/py3-typing-extensions.yaml
@@ -2,7 +2,7 @@
 package:
   name: py3-typing-extensions
   version: 4.12.2
-  epoch: 2
+  epoch: 3
   description: Backported and Experimental Type Hints for Python 3.7+
   copyright:
     - license: PSF-2.0
@@ -26,6 +26,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - py3-supported-flit-core
       - py3-supported-installer
       - py3-supported-pip
       - py3-supported-python