diff --git a/images.yml b/images.yml
index 9fe8bc7..d9a7290 100644
--- a/images.yml
+++ b/images.yml
@@ -5,8 +5,42 @@ docker_repo: 'coqorg/coq'
 args:
   BUILD_DATE: '{defaults[build_date]}'
 images:
+  # BEGIN TODO REMOVE
   - matrix:
-      default: ['4.07.1-flambda']
+      default: ['latest']
+      base: ['latest']
+      coq: ['dev']
+    build:
+      keywords:
+        - 'dev'
+      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-native coq-bignums'
+      tags:
+        # default tag (dev)
+        - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # full tag
+        - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
+        # abbreviated tag (*-ocaml-4.05)
+        - tag: '{matrix[coq]}-ocaml-{matrix[base][%.*]}'
+          if: '{matrix[base]} == 4.05.0'
+        # abbreviated tag (*-ocaml-4.07-flambda)
+        - tag: '{matrix[coq]}-ocaml-{matrix[base][%.*-*]}-flambda'
+          if: '{matrix[base]} != 4.05.0'
+  # END TODO REMOVE
+  - matrix:
+      default: ['latest']
+    # default: ['4.07.1-flambda']
       base: ['4.05.0', '4.07.1-flambda', '4.10.1-flambda', '4.11.1-flambda']
       coq: ['dev']
     build:
@@ -73,8 +107,50 @@ images:
   #       # abbreviated tag (*-ocaml-4.07-flambda)
   #       - tag: '{matrix[coq]}-ocaml-{matrix[base][%.*-*]}-flambda'
   #         if: '{matrix[base]} != 4.05.0'
+  # BEGIN TODO REMOVE
+  - matrix:
+      default: ['latest']
+      base: ['latest']
+      # TODO: Update when appropriate
+      coq: ['8.13-alpha']
+    build:
+      # TODO: Remove this commit_api section when the beta is released
+      commit_api:
+        fetcher: 'github'
+        repo: 'coq/coq'
+        branch: 'v8.13'
+      context: './coq'
+      # TODO: Replace with "beta/Dockerfile" when the beta is released
+      dockerfile: './dual/dev/Dockerfile'
+      keywords:
+        - '8.13'
+      args:
+        BASE_TAG: '{matrix[base]}'
+        # TODO: Replace with '{matrix[coq]}' when the beta is released
+        COQ_VERSION: '{matrix[coq][%-*]}.dev'
+        COQ_COMMIT: '{defaults[commit]}'
+        # TODO: Replace with 'V{matrix[coq][//-/+]}' when the beta is released
+        VCS_REF: '{defaults[commit][0:7]}'
+        COQ_EXTRA_OPAM: 'coq-native coq-bignums'
+      tags:
+        # default tag (8.13-alpha)
+        - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # abbreviated tag (8.13)
+        - tag: '{matrix[coq][%-*]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # full tag
+        - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
+        # abbreviated tag (*-ocaml-4.05)
+        - tag: '{matrix[coq][%-*]}-ocaml-{matrix[base][%.*]}'
+          if: '{matrix[base]} == 4.05.0'
+        # abbreviated tag (*-ocaml-4.07-flambda)
+        - tag: '{matrix[coq][%-*]}-ocaml-{matrix[base][%.*-*]}-flambda'
+          if: '{matrix[base]} != 4.05.0'
+  # END TODO REMOVE
   - matrix:
-      default: ['4.07.1-flambda']
+      default: ['latest']
+    # default: ['4.07.1-flambda']
       base: ['4.05.0', '4.07.1-flambda', '4.10.1-flambda', '4.11.1-flambda']
       # TODO: Update when appropriate
       coq: ['8.13-alpha']
@@ -112,8 +188,54 @@ images:
         # abbreviated tag (*-ocaml-4.07-flambda)
         - tag: '{matrix[coq][%-*]}-ocaml-{matrix[base][%.*-*]}-flambda'
           if: '{matrix[base]} != 4.05.0'
+  # BEGIN TODO REMOVE
   - matrix:
-      default: ['4.07.1-flambda']
+      default: ['latest']
+      base: ['latest']
+      coq: ['8.12.1', '8.11.2']
+      coq_latest: ['8.12.1']
+    build:
+      context: './coq'
+      dockerfile: './dual/stable/Dockerfile'
+      args:
+        BASE_TAG: '{matrix[base]}'
+        COQ_VERSION: '{matrix[coq]}'
+        VCS_REF: 'V{matrix[coq]}'
+        COQ_EXTRA_OPAM: 'coq-native coq-bignums'
+      tags:
+        # latest tag
+        - tag: 'latest'
+          if:
+            - '{matrix[coq]} == {matrix[coq_latest]}'
+            - '{matrix[base]} == {matrix[default]}'
+        # default tag (8.12.1)
+        - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # abbreviated tag (8.12)
+        - tag: '{matrix[coq][%.*]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # latest-abbreviated tag (*-ocaml-4.05)
+        - tag: 'latest-ocaml-{matrix[base][%.*]}'
+          if:
+            - '{matrix[coq]} == {matrix[coq_latest]}'
+            - '{matrix[base]} == 4.05.0'
+        # latest-abbreviated tag (*-ocaml-4.07-flambda)
+        - tag: 'latest-ocaml-{matrix[base][%.*-*]}-flambda'
+          if:
+            - '{matrix[coq]} == {matrix[coq_latest]}'
+            - '{matrix[base]} != 4.05.0'
+        # full tag
+        - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
+        # abbreviated tag (*-ocaml-4.05)
+        - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*]}'
+          if: '{matrix[base]} == 4.05.0'
+        # abbreviated tag (*-ocaml-4.07-flambda)
+        - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*-*]}-flambda'
+          if: '{matrix[base]} != 4.05.0'
+  # END TODO REMOVE
+  - matrix:
+      default: ['latest']
+    # default: ['4.07.1-flambda']
       base: ['4.05.0', '4.07.1-flambda', '4.10.1-flambda', '4.11.1-flambda']
       coq: ['8.12.1', '8.11.2']
       coq_latest: ['8.12.1']
@@ -155,8 +277,38 @@ images:
         # abbreviated tag (*-ocaml-4.07-flambda)
         - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*-*]}-flambda'
           if: '{matrix[base]} != 4.05.0'
+  # BEGIN TODO REMOVE
+  - matrix:
+      default: ['latest']
+      base: ['latest']
+      coq: ['8.10.2', '8.9.1', '8.8.2', '8.7.2']
+    build:
+      context: './coq'
+      dockerfile: './dual/stable/Dockerfile'
+      args:
+        BASE_TAG: '{matrix[base]}'
+        COQ_VERSION: '{matrix[coq]}'
+        VCS_REF: 'V{matrix[coq]}'
+        COQ_EXTRA_OPAM: 'coq-native coq-bignums'
+      tags:
+        # default tag (8.10.2)
+        - tag: '{matrix[coq]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # abbreviated tag (8.10)
+        - tag: '{matrix[coq][%.*]}'
+          if: '{matrix[base]} == {matrix[default]}'
+        # full tag
+        - tag: '{matrix[coq]}-ocaml-{matrix[base]}'
+        # abbreviated tag (*-ocaml-4.05)
+        - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*]}'
+          if: '{matrix[base]} == 4.05.0'
+        # abbreviated tag (*-ocaml-4.07-flambda)
+        - tag: '{matrix[coq][%.*]}-ocaml-{matrix[base][%.*-*]}-flambda'
+          if: '{matrix[base]} != 4.05.0'
+  # END TODO REMOVE
   - matrix:
-      default: ['4.07.1-flambda']
+      default: ['latest']
+    # default: ['4.07.1-flambda']
       base: ['4.05.0', '4.07.1-flambda', '4.08.1-flambda', '4.09.1-flambda']
       coq: ['8.10.2', '8.9.1', '8.8.2', '8.7.2']
     build: