diff --git a/.github/workflows/_build_publish.yaml b/.github/workflows/_build_publish.yaml
index de4d675c9394..006266649dca 100644
--- a/.github/workflows/_build_publish.yaml
+++ b/.github/workflows/_build_publish.yaml
@@ -88,7 +88,11 @@ jobs:
         run: |
           make publish/pulp
   build-images:
+<<<<<<< HEAD
     runs-on: ubuntu-22.04 # pining to this version until https://github.com/actions/runner-images/issues/10636#issuecomment-2397720931 has a better solution
+=======
+    runs-on: ubuntu-latest
+>>>>>>> 4d7584cef (ci(gha): bump timeout for image build (#11533))
     timeout-minutes: 30
     strategy:
       fail-fast: false