diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index 0cf9156f9..87fae3bc2 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -32,7 +32,7 @@ jobs:
           - { name: Fedora,           id: fedora   }
           - { name: OpenSUSE,         id: opensuse }
           - { name: Ubuntu Bionic,    id: bionic   }
-          - { name: Ubuntu Eoan,      id: eoan     }
+          - { name: Ubuntu Rolling,   id: ubuntu-rolling  }
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index 1883588ee..3cdcccdd1 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -21,7 +21,6 @@ on:
       - "run_unittests.py"
 
 jobs:
-  arch:
     name: ${{ matrix.cfg.name }}
     runs-on: ubuntu-latest
     strategy:
@@ -42,8 +41,8 @@ jobs:
       # via the `args` array ub the image.json
       run: bash -c 'source /ci/env_vars.sh; cd $GITHUB_WORKSPACE; ./run_tests.py $CI_ARGS'
 
-  eoan:
-    name: 'Ubuntu Eoan'
+  ubuntu-rolling:
+    name: 'Ubuntu Rolling'
     runs-on: ubuntu-latest
 
     strategy:
@@ -72,7 +71,7 @@ jobs:
             CXX: 'g++'
 
     container:
-      image: mesonbuild/eoan
+      image: mesonbuild/ubuntu-rolling
       env:
         MESON_RSP_THRESHOLD: ${{ matrix.cfg.MESON_RSP_THRESHOLD }}
         MESON_ARGS: ${{ matrix.cfg.MESON_ARGS }}
diff --git a/ci/ciimage/eoan/image.json b/ci/ciimage/ubuntu-rolling/image.json
similarity index 59%
rename from ci/ciimage/eoan/image.json
rename to ci/ciimage/ubuntu-rolling/image.json
index cbf86c30d..038b9451c 100644
--- a/ci/ciimage/eoan/image.json
+++ b/ci/ciimage/ubuntu-rolling/image.json
@@ -1,5 +1,5 @@
 {
-  "base_image": "ubuntu:eoan",
+  "base_image": "ubuntu:rolling",
   "env": {
     "CI": "1",
     "DC": "gdc"
diff --git a/ci/ciimage/eoan/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
similarity index 89%
rename from ci/ciimage/eoan/install.sh
rename to ci/ciimage/ubuntu-rolling/install.sh
index 36dec72b1..507113b13 100755
--- a/ci/ciimage/eoan/install.sh
+++ b/ci/ciimage/ubuntu-rolling/install.sh
@@ -9,14 +9,12 @@ export LANG='C.UTF-8'
 export DC=gdc
 
 pkgs=(
-  python3-pytest-xdist
+  python3-pytest-xdist python3-jsonschema
   python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
   python3-lxml
   wget unzip
   qt5-default clang
   pkg-config-arm-linux-gnueabihf
-  qt4-linguist-tools
-  python-dev
   libomp-dev
   llvm lcov
   dub ldc
@@ -43,7 +41,7 @@ eatmydata apt-get -y build-dep meson
 eatmydata apt-get -y install "${pkgs[@]}"
 eatmydata apt-get -y install --no-install-recommends wine-stable  # Wine is special
 
-eatmydata python3 -m pip install hotdoc codecov gcovr jsonschema
+eatmydata python3 -m pip install hotdoc codecov gcovr
 
 # dub stuff
 dub_fetch urld
diff --git a/ci/ciimage/eoan/test.sh b/ci/ciimage/ubuntu-rolling/test.sh
similarity index 100%
rename from ci/ciimage/eoan/test.sh
rename to ci/ciimage/ubuntu-rolling/test.sh