diff --git a/coq/beta/Dockerfile b/coq/beta/Dockerfile
index 3c0157d..a73b846 100644
--- a/coq/beta/Dockerfile
+++ b/coq/beta/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/coq/dev/Dockerfile b/coq/dev/Dockerfile
index 43b51db..c2a0659 100644
--- a/coq/dev/Dockerfile
+++ b/coq/dev/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/coq/dual/beta/Dockerfile b/coq/dual/beta/Dockerfile
index 85682b7..2e5430f 100644
--- a/coq/dual/beta/Dockerfile
+++ b/coq/dual/beta/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/coq/dual/dev/Dockerfile b/coq/dual/dev/Dockerfile
index dbd1c55..e7dc02f 100644
--- a/coq/dual/dev/Dockerfile
+++ b/coq/dual/dev/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/coq/dual/stable/Dockerfile b/coq/dual/stable/Dockerfile
index be64875..06e2adc 100644
--- a/coq/dual/stable/Dockerfile
+++ b/coq/dual/stable/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/coq/stable/Dockerfile b/coq/stable/Dockerfile
index f818ebf..8a1afab 100644
--- a/coq/stable/Dockerfile
+++ b/coq/stable/Dockerfile
@@ -1,4 +1,3 @@
-# TODO later: Use coqorg/base:4.05.0
 ARG BASE_TAG="latest"
 FROM coqorg/base:${BASE_TAG}
 
diff --git a/images.yml b/images.yml
index 4ad7eff..24fb559 100644
--- a/images.yml
+++ b/images.yml
@@ -6,29 +6,8 @@ args:
   BUILD_DATE: '{defaults[build_date]}'
 images:
   - matrix:
-      # TODO: replace latest with 2 images (single-switch), merge tags
-      base: ['latest']
-      coq: ['dev']
-    build:
-      nightly: true
-      context: './coq'
-      dockerfile: './dual/dev/Dockerfile'
-      commit_api:
-        fetcher: 'github'
-        repo: 'coq/coq'
-        branch: 'master'
-      args:
-        BASE_TAG: '{matrix[base]}'
-        COQ_VERSION: '{matrix[coq]}'
-        COQ_COMMIT: '{defaults[commit]}'
-        VCS_REF: '{defaults[commit][0:7]}'
-        COQ_EXTRA_OPAM: 'coq-bignums'
-      tags:
-        - tag: '{matrix[coq]}'
-          if: '{matrix[base]} == "latest"'
-          # TODO: remove all occurrences of 'coqorg/base:latest'
-  - matrix:
-      base: ['4.09.1-flambda']
+      minimal: ['4.05.0']
+      base: ['4.05.0', '4.07.1-flambda', '4.09.1-flambda']
       coq: ['dev']
     build:
       nightly: true
@@ -45,13 +24,16 @@ images:
         VCS_REF: '{defaults[commit][0:7]}'
         COQ_EXTRA_OPAM: 'coq-bignums'
       tags:
+        - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
         - tag: '{matrix[coq]}-ocaml-{matrix[base][%.*-*]}-flambda'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
   # FIXME: Update later on
   # - matrix:
-  #     base: ['latest', '4.09.1-flambda']
+  #     minimal: ['4.05.0']
+  #     base: ['4.05.0', '4.07.1-flambda', '4.09.1-flambda']
   #     coq: ['8.13-alpha']
   #   build:
   #     nightly: true
@@ -69,18 +51,18 @@ images:
   #       COQ_EXTRA_OPAM: 'coq-bignums'
   #     tags:
   #       - tag: '{matrix[coq]}'
-  #         if: '{matrix[base]} == "latest"'
+  #         if: '{matrix[base]} == {matrix[minimal]}'
   #       - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
-  #         if: '{matrix[base]} != "latest"'
+  #         if: '{matrix[base]} != {matrix[minimal]}'
   #       - tag: '{matrix[coq][%-*]}-ocaml-{matrix[base][%.*-*]}-flambda'
-  #         if: '{matrix[base]} != "latest"'
+  #         if: '{matrix[base]} != {matrix[minimal]}'
   - matrix:
-      # TODO: replace latest with 2 images (single-switch), merge tags
-      base: ['latest']
+      minimal: ['4.05.0']
+      base: ['4.05.0', '4.07.1-flambda', '4.09.1-flambda']
       coq: ['8.12-beta1']
     build:
       context: './coq'
-      dockerfile: './dual/beta/Dockerfile'
+      dockerfile: './beta/Dockerfile'
       args:
         BASE_TAG: '{matrix[base]}'
         COQ_VERSION: '{matrix[coq][//-/+]}'
@@ -88,32 +70,21 @@ images:
         COQ_EXTRA_OPAM: 'coq-bignums'
       tags:
         - tag: '{matrix[coq]}'
-          if: '{matrix[base]} == "latest"'
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq][%-*]}'
-          if: '{matrix[base]} == "latest"'
-  - matrix:
-      base: ['4.09.1-flambda']
-      coq: ['8.12-beta1']
-    build:
-      context: './coq'
-      dockerfile: './beta/Dockerfile'
-      args:
-        BASE_TAG: '{matrix[base]}'
-        COQ_VERSION: '{matrix[coq][//-/+]}'
-        VCS_REF: 'V{matrix[coq][//-/+]}'
-        COQ_EXTRA_OPAM: 'coq-bignums'
-      tags:
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
         - tag: '{matrix[coq][%-*]}-ocaml-{matrix[base][%.*-*]}-flambda'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
   - matrix:
-      # TODO: replace latest with 2 images (single-switch), merge tags
-      base: ['latest']
+      minimal: ['4.05.0']
+      base: ['4.05.0', '4.07.1-flambda', '4.09.1-flambda']
       coq: ['8.11.2', '8.10.2', '8.9.1', '8.8.2']
+      coq_latest: ['8.11.2']
     build:
       context: './coq'
-      dockerfile: './dual/stable/Dockerfile'
+      dockerfile: './stable/Dockerfile'
       args:
         BASE_TAG: '{matrix[base]}'
         COQ_VERSION: '{matrix[coq]}'
@@ -122,40 +93,27 @@ images:
       tags:
         - tag: 'latest'
           if:
-            # TODO: Bump this version too:
-            - '{matrix[coq]} == "8.11.2"'
-            - '{matrix[base]} == "latest"'
+            - '{matrix[coq]} == {matrix[coq_latest]}'
+            - '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq]}'
-          if: '{matrix[base]} == "latest"'
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq][%.*]}'
-          if: '{matrix[base]} == "latest"'
-  - matrix:
-      base: ['4.09.1-flambda']
-      coq: ['8.11.2', '8.10.2', '8.9.1', '8.8.2']
-    build:
-      context: './coq'
-      dockerfile: './stable/Dockerfile'
-      args:
-        BASE_TAG: '{matrix[base]}'
-        COQ_VERSION: '{matrix[coq]}'
-        VCS_REF: 'V{matrix[coq]}'
-        COQ_EXTRA_OPAM: 'coq-bignums'
-      tags:
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: 'latest-ocaml-{matrix[base][%.*-*]}-flambda'
           if:
-            # TODO: Bump this version too:
-            - '{matrix[coq]} == "8.11.2"'
-            - '{matrix[base]} != "latest"'
+            - '{matrix[coq]} == {matrix[coq_latest]}'
+            - '{matrix[base]} != {matrix[minimal]}'
         - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
         - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*-*]}-flambda'
-          if: '{matrix[base]} != "latest"'
+          if: '{matrix[base]} != {matrix[minimal]}'
   - matrix:
-      base: ['latest']
+      minimal: ['4.05.0']
+      base: ['4.05.0', '4.07.1-flambda']
       coq: ['8.7.2']
     build:
       context: './coq'
-      dockerfile: './dual/stable/Dockerfile'
+      dockerfile: './stable/Dockerfile'
       args:
         BASE_TAG: '{matrix[base]}'
         COQ_VERSION: '{matrix[coq]}'
@@ -163,7 +121,13 @@ images:
         COQ_EXTRA_OPAM: 'coq-bignums'
       tags:
         - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[minimal]}'
         - tag: '{matrix[coq][%.*]}'
+          if: '{matrix[base]} == {matrix[minimal]}'
+        - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
+          if: '{matrix[base]} != {matrix[minimal]}'
+        - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*-*]}-flambda'
+          if: '{matrix[base]} != {matrix[minimal]}'
   - matrix:
       base: ['4.02.3']
       coq: ['8.6.1']