diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74174e05..d61ea66a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,91 +20,6 @@ jobs:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - /terminology
-
-  build_full_clang_efl-1.22:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    environment:
-      - CC: clang
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
-      - run:
-          name: Compile with Clang
-          command: |
-            cd /terminology
-            meson -Dtests=true -Dfuzzing=true . build
-            meson configure build
-            cd build
-            ninja -j4
-  build_and_test_clang_ubsan_efl-1.22:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    environment:
-      - CC: clang
-      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=undefined
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
-      - run:
-          name: Compile with Clang
-          command: |
-            cd /terminology
-            meson -Dtests=true . build
-            meson configure build
-            cd build
-            ninja -j4
-      - run:
-          name: Launch tests
-          command: |
-            cd /terminology
-            tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results -d tests/
-  build_full_gcc_efl-1.22:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
-      - run:
-          name: Compile with GCC
-          environment:
-            CFLAGS: -O0 -g
-          command: |
-            cd /terminology
-            meson -Dtests=true -Dfuzzing=true -Db_coverage=true . build
-            meson configure build
-            cd build
-            ninja -j4
-      - save_cache:
-          key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
-          paths:
-            - /terminology
-  build_minimal_gcc_efl-1.21:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.21.1-r0.apk /pkg/efl-dev-1.21.1-r0.apk
-      - run:
-          name: Compile with GCC
-          command: |
-            cd /terminology
-            meson . build
-            meson configure build
-            cd build
-            ninja -j4
   build_minimal_gcc_efl-1.20:
     docker:
       - image: borisfaure/terminology-ci:latest
@@ -122,15 +37,89 @@ jobs:
             meson configure build
             cd build
             ninja -j4
-  tests_gcc:
+  build_minimal_gcc_efl-1.21:
     docker:
       - image: borisfaure/terminology-ci:latest
     steps:
       - restore_cache:
-          key: build_full_gcc-efl-1.22-{{ .Environment.CIRCLE_SHA1 }}
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-1.21.1-r0.apk /pkg/efl-dev-1.21.1-r0.apk
+      - run:
+          name: Compile with GCC
+          command: |
+            cd /terminology
+            meson . build
+            meson configure build
+            cd build
+            ninja -j4
+  build_minimal_gcc_efl-1.22:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Install EFL
           command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
+      - run:
+          name: Compile with GCC
+          command: |
+            cd /terminology
+            meson . build
+            meson configure build
+            cd build
+            ninja -j4
+  build_minimal_gcc_efl-1.23:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-1.23.1-r0.apk /pkg/efl-dev-1.23.1-r0.apk
+      - run:
+          name: Compile with GCC
+          command: |
+            cd /terminology
+            meson . build
+            meson configure build
+            cd build
+            ninja -j4
+  build_full_gcc_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with GCC
+          environment:
+            CFLAGS: -O0 -g
+          command: |
+            cd /terminology
+            meson -Dtests=true -Dfuzzing=true -Db_coverage=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - save_cache:
+          key: build_full_gcc_efl_latest-{{ .Environment.CIRCLE_SHA1 }}
+          paths:
+            - /terminology
+  tests_gcc_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    steps:
+      - restore_cache:
+          key: build_full_gcc_efl_latest-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
       - run:
           name: Launch tests
           command: |
@@ -149,27 +138,77 @@ jobs:
             chmod +x .codecov
             sed -i.bak 's/execdir/exec/' .codecov
             ./.codecov -Z
+  build_full_clang_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dtests=true -Dfuzzing=true . build
+            meson configure build
+            cd build
+            ninja -j4
+  build_and_test_clang_ubsan_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=undefined
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dtests=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - run:
+          name: Launch tests
+          command: |
+            cd /terminology
+            tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results -d tests/
 path: /terminology
 workflows:
   version: 2
   build-and-deploy:
     jobs:
       - checkout_code
-      - build_full_gcc_efl-1.22:
+      - build_minimal_gcc_efl-1.20:
           requires:
             - checkout_code
       - build_minimal_gcc_efl-1.21:
           requires:
             - checkout_code
-      - build_minimal_gcc_efl-1.20:
+      - build_minimal_gcc_efl-1.22:
           requires:
             - checkout_code
-      - tests_gcc:
-          requires:
-            - build_full_gcc_efl-1.22
-      - build_full_clang_efl-1.22:
+      - build_minimal_gcc_efl-1.23:
           requires:
             - checkout_code
-      - build_and_test_clang_ubsan_efl-1.22:
+      - build_full_gcc_efl_latest:
+          requires:
+            - checkout_code
+      - tests_gcc_efl_latest:
+          requires:
+            - build_full_gcc_efl_latest
+      - build_full_clang_efl_latest:
+          requires:
+            - checkout_code
+      - build_and_test_clang_ubsan_efl_latest:
           requires:
             - checkout_code