diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49156dee0d9a81e1a845beec3f48827bb0b8bb4f..1edc3edb547cc0de22cb94d256ae7b3a95b46569 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,9 +180,6 @@ spread-qemu:
     CACHE_COMPRESSION_LEVEL: "fastest"
   parallel:
     matrix:
-      - VERSION_CODENAME: [hirsute]
-        ID: [ubuntu]
-        ID_VERSION: ["21.04"]
       - VERSION_CODENAME: [impish]
         ID: [ubuntu]
         ID_VERSION: ["21.10"]
diff --git a/spread.yaml b/spread.yaml
index 36cb418d908a600dcfff118610bb650802062188..30dd2deaf5b61109b0043b224740db6f16085e5d 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -10,9 +10,6 @@ backends:
     qemu:
         memory: 1G
         systems:
-            - ubuntu-21.04-64:
-                username: ubuntu
-                password: ubuntu
             - ubuntu-21.10-64:
                 username: ubuntu
                 password: ubuntu