diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2b20d6..9882200 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,12 @@ jobs:
     strategy:
       matrix:
         include:
+          - ODOOVERSION: "12.0"
+          - ODOOVERSION: "13.0"
           - ODOOVERSION: "14.0"
+          - ODOOVERSION: "15.0"
+          - ODOOVERSION: "16.0"
+
     steps:
       - uses: actions/checkout@v2
       - name: Set up Docker Buildx
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
new file mode 100644
index 0000000..f13c804
--- /dev/null
+++ b/12.0/Dockerfile
@@ -0,0 +1,26 @@
+FROM python:3.10.12-alpine3.18
+
+RUN apk fix && \
+    apk --no-cache --update add git git-lfs gpg less openssh patch bash && \
+    git lfs install
+
+# we cannot use a more recent version for now
+# see https://github.com/yaml/pyyaml/issues/724
+# note that we install ak and git-aggregator to be able to do ak-build
+# later in a builder image based on this image and ensure odoo/src
+# is converged to the proper revision with the proper merges
+RUN pip install PyYaml==5.3.1
+RUN pip install git+https://github.com/akretion/ak
+
+COPY repos.yml /root/.config/git-autoshare/repos.yml
+RUN pip install git-autoshare git-aggregator
+COPY bin/* /usr/local/bin/
+COPY install/* /install/
+
+# pre-fetch the git-autoshare cache with the bare minimum:
+ADD https://api.github.com/repos/odoo/odoo/git/refs/heads/12.0 version.json
+RUN mkdir -p /root/.cache/git-autoshare/github.com/odoo && \
+    cd /root/.cache/git-autoshare/github.com/odoo && \
+    /usr/bin/git init --bare && \
+    /usr/bin/git fetch https://github.com/OCA/OCB.git refs/heads/12.0:refs/git-autoshare/oca/heads/12.0 --shallow-since=2018-10-01 && \
+    /usr/bin/git fetch https://github.com/odoo/odoo.git refs/heads/12.0:refs/git-autoshare/odoo/heads/12.0 --shallow-since=2018-10-01
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
new file mode 100644
index 0000000..585feb5
--- /dev/null
+++ b/13.0/Dockerfile
@@ -0,0 +1,26 @@
+FROM python:3.10.12-alpine3.18
+
+RUN apk fix && \
+    apk --no-cache --update add git git-lfs gpg less openssh patch bash && \
+    git lfs install
+
+# we cannot use a more recent version for now
+# see https://github.com/yaml/pyyaml/issues/724
+# note that we install ak and git-aggregator to be able to do ak-build
+# later in a builder image based on this image and ensure odoo/src
+# is converged to the proper revision with the proper merges
+RUN pip install PyYaml==5.3.1
+RUN pip install git+https://github.com/akretion/ak
+
+COPY repos.yml /root/.config/git-autoshare/repos.yml
+RUN pip install git-autoshare git-aggregator
+COPY bin/* /usr/local/bin/
+COPY install/* /install/
+
+# pre-fetch the git-autoshare cache with the bare minimum:
+ADD https://api.github.com/repos/odoo/odoo/git/refs/heads/13.0 version.json
+RUN mkdir -p /root/.cache/git-autoshare/github.com/odoo && \
+    cd /root/.cache/git-autoshare/github.com/odoo && \
+    /usr/bin/git init --bare && \
+    /usr/bin/git fetch https://github.com/OCA/OCB.git refs/heads/13.0:refs/git-autoshare/oca/heads/13.0 --shallow-since=2019-10-01 && \
+    /usr/bin/git fetch https://github.com/odoo/odoo.git refs/heads/13.0:refs/git-autoshare/odoo/heads/13.0 --shallow-since=2019-10-01
diff --git a/14.0/Dockerfile b/14.0/Dockerfile
index f6788cd..cd2a9b0 100644
--- a/14.0/Dockerfile
+++ b/14.0/Dockerfile
@@ -22,5 +22,5 @@ ADD https://api.github.com/repos/odoo/odoo/git/refs/heads/14.0 version.json
 RUN mkdir -p /root/.cache/git-autoshare/github.com/odoo && \
     cd /root/.cache/git-autoshare/github.com/odoo && \
     /usr/bin/git init --bare && \
-    /usr/bin/git fetch https://github.com/OCA/OCB.git refs/heads/14.0:refs/git-autoshare/oca/heads/14.0 --shallow-since=2021-10-01 && \
-    /usr/bin/git fetch https://github.com/odoo/odoo.git refs/heads/14.0:refs/git-autoshare/odoo/heads/14.0 --shallow-since=2021-10-01
+    /usr/bin/git fetch https://github.com/OCA/OCB.git refs/heads/14.0:refs/git-autoshare/oca/heads/14.0 --shallow-since=2020-10-01 && \
+    /usr/bin/git fetch https://github.com/odoo/odoo.git refs/heads/14.0:refs/git-autoshare/odoo/heads/14.0 --shallow-since=2020-10-01
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
new file mode 100644
index 0000000..f10d097
--- /dev/null
+++ b/15.0/Dockerfile
@@ -0,0 +1,26 @@
+FROM python:3.10.12-alpine3.18
+
+RUN apk fix && \
+    apk --no-cache --update add git git-lfs gpg less openssh patch bash && \
+    git lfs install
+
+# we cannot use a more recent version for now
+# see https://github.com/yaml/pyyaml/issues/724
+# note that we install ak and git-aggregator to be able to do ak-build
+# later in a builder image based on this image and ensure odoo/src
+# is converged to the proper revision with the proper merges
+RUN pip install PyYaml==5.3.1
+RUN pip install git+https://github.com/akretion/ak
+
+COPY repos.yml /root/.config/git-autoshare/repos.yml
+RUN pip install git-autoshare git-aggregator
+COPY bin/* /usr/local/bin/
+COPY install/* /install/
+
+# pre-fetch the git-autoshare cache with the bare minimum:
+ADD https://api.github.com/repos/odoo/odoo/git/refs/heads/15.0 version.json
+RUN mkdir -p /root/.cache/git-autoshare/github.com/odoo && \
+    cd /root/.cache/git-autoshare/github.com/odoo && \
+    /usr/bin/git init --bare && \
+    /usr/bin/git fetch https://github.com/OCA/OCB.git refs/heads/15.0:refs/git-autoshare/oca/heads/15.0 --shallow-since=2021-10-01 && \
+    /usr/bin/git fetch https://github.com/odoo/odoo.git refs/heads/15.0:refs/git-autoshare/odoo/heads/15.0 --shallow-since=2021-10-01