diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index a1a7854..0e56372 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -6,14 +6,15 @@ orbs:
 executors:
   ubuntu-18_04:
     docker:
-    - image: ubuntu:bionic-20220128
+    - image: ubuntu:bionic-20220427
   xcode-10_3:
     macos:
       xcode: 10.3.0
-  # Used by the macos-gles3 build
-  xcode-11_4:
+  # Since 2922-05-23, 11.4.1 images wait endlessly for "VM assignment", using
+  # 11.5 instead.
+  xcode-11_5:
     macos:
-      xcode: 11.4.1
+      xcode: 11.5
 
 commands:
   install-base-linux:
@@ -30,21 +31,27 @@ commands:
           if [[ "$CMAKE_CXX_FLAGS" == *"--coverage"* ]]; then export LCOV_PACKAGES="lcov curl"; fi
           apt install -y git ninja-build $LCOV_PACKAGES << parameters.extra >>
 
+  # ninja needs python@3.9 as a dependency FOR SOME FUCKING REASON and when THE
+  # DAMN THING installs it, it proceeds with reinstalling python@2. FROM
+  # SOURCES! FUCK! and then it fails to link it because NO SHIT, python@3.9 is
+  # already installed! HOW THE FUCK ARE PEOPLE ABLE TO DEAL WITH SUCH CURSED
+  # SHIT ALL THE TIME?! FUCK OFF
+  #
+  # TODO: Needed only on 10.3 and 11.4, not on 11.5 anymore, remove once those
+  #   images are not used anymore.
+  macos-remove-python-curse:
+    steps:
+    - run:
+        name: Remove Python 2 curse
+        command: |
+          HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall python@2
+
   install-base-macos:
     parameters:
       extra:
         type: string
         default: ""
     steps:
-    - run:
-        # ninja needs python@3.9 as a dependency FOR SOME FUCKING REASON and
-        # when THE DAMN THING installs it, it proceeds with reinstalling
-        # python@2. FROM SOURCES! FUCK! and then it fails to link it because
-        # NO SHIT, python@3.9 is already installed! HOW THE FUCK ARE PEOPLE
-        # ABLE TO DEAL WITH SUCH CURSED SHIT ALL THE TIME?! FUCK OFF
-        name: Remove Python 2 curse
-        command: |
-          HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall python@2
     - run:
         name: Install base packages
         # As usual, homebrew takes five minutes to update and then explodes in
@@ -264,6 +271,7 @@ jobs:
       CMAKE_CXX_FLAGS: --coverage
       PLATFORM_GL_API: CGL
     steps:
+    - macos-remove-python-curse
     - install-base-macos:
         extra: sdl2 glfw numpy pybind11
     - build:
@@ -273,7 +281,7 @@ jobs:
   macos-gles3:
     # Using the same executor as Magnum uses for the ES3 build. 10.3 fails to
     # load the libGLESv2.dylib due to "Symbol not found: _objc_opt_class".
-    executor: xcode-11_4
+    executor: xcode-11_5
     environment:
       CMAKE_CXX_FLAGS: --coverage
       PLATFORM_GL_API: EGL
@@ -298,6 +306,7 @@ jobs:
       CMAKE_CXX_FLAGS: --coverage
       PLATFORM_GL_API: CGL
     steps:
+    - macos-remove-python-curse
     - install-base-macos:
         extra: sdl2 glfw numpy pybind11
     - build: