diff --git a/eclair-tf-a-3.12/Dockerfile b/eclair-tf-a-3.12/Dockerfile
deleted file mode 100644
index 7264c2b..0000000
--- a/eclair-tf-a-3.12/Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2021-2022 BUGSENG srl. All rights reserved.
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-
-FROM trustedfirmware/ci-amd64-tf-a-ubuntu:jammy
-
-ARG EclairVersion=3.12.0
-ARG EclairVariant=MC23P1-l64P
-
-ENV ECLAIR_LICENSE_SERVER eclair.trustedfirmware.org
-ENV ECLAIR_LICENSE_USER unguessable
-
-ARG SentinelVersion=8.23.1
-
-ARG SetupDir=/tmp/eclair-${EclairVersion}-${EclairVariant}
-ARG SetupFile=ECLAIR_${EclairVersion}-${EclairVariant}_Setup.run
-
-ENV ECLAIR_TOP_DIR /opt/bugseng/eclair-${EclairVersion}
-ENV DEBIAN_FRONTEND noninteractive
-ENV LANG C.UTF-8
-
-COPY ${SetupFile} /tmp
-
-RUN apt-get update
-
-RUN apt-get -y -q install xz-utils apt-utils socat
-
-RUN cd /tmp && \
-    chmod +x ${SetupFile} && \
-    ./${SetupFile} --keep --noexec
-
-RUN cd /tmp && \
-    tar xzf "${SetupDir}/reqs/Sentinel_LDK_RTE/aksusbd-${SentinelVersion}.tar.gz" && \
-    cd aksusbd-${SentinelVersion} && \
-    ./dinst && \
-    cd .. && \
-    rm -rf aksusbd-${SentinelVersion}
-
-RUN cd ${SetupDir} && \
-    mkdir -m 755 -p "${ECLAIR_TOP_DIR}" && \
-    mv * "${ECLAIR_TOP_DIR}" && \
-    cd "${ECLAIR_TOP_DIR}/.." && \
-    ln -sf "$(basename "${ECLAIR_TOP_DIR}")" eclair && \
-    "${ECLAIR_TOP_DIR}/bin/postinstall.sh"
-
-RUN rm -rf ${SetupDir} && \
-    rm -rf /tmp/${SetupFile}
-
-ENV PATH ${PATH}:${ECLAIR_TOP_DIR}/../bin:${ECLAIR_TOP_DIR}/bin
-
-RUN apt-get install -y -q sudo && \
-    useradd -m eclair -s /bin/bash && \
-    echo "eclair ALL=NOPASSWD: ALL" > /etc/sudoers.d/eclair
-
-
-# Can be overriden at build time
-ENV WORKSPACE "/home/buildslave/workspace/pfalcon-tf-a-eclair"
-
-RUN rm -rf /var/hasplm/storage
-
-RUN apt-get update && \
-    apt-get -y -q --no-install-recommends install \
-    device-tree-compiler \
-    git \
-    make \
-    nano \
-    openjdk-11-jre-headless \
-    openssh-server \
-    python3
-
-COPY tf-*.install /tmp/
-COPY setup-sshd /usr/sbin/setup-sshd
-COPY entrypoint.sh /usr/sbin/entrypoint.sh
-
-RUN bash -ex /tmp/tf-environment.install
-
-
-USER eclair
-
-COPY bin/ /opt/bugseng/bin
-
-EXPOSE 22
-
-ENTRYPOINT ["/usr/sbin/entrypoint.sh"]
diff --git a/eclair-tf-a-3.12/build.sh b/eclair-tf-a-3.12/build.sh
deleted file mode 100755
index 6ea0614..0000000
--- a/eclair-tf-a-3.12/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export LANG=C
-
-tag=$(basename $PWD)
-
-[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
-
-cp ../eclair-linaro/ECLAIR_3.12.0-MC23P1-l64P_Setup.run .
-cp -a ../bin .
-
-image=${ECR}/misra:$tag
-docker build --pull --tag=$image .
-echo $image > .docker-tag
diff --git a/eclair-tf-a-3.12/entrypoint.sh b/eclair-tf-a-3.12/entrypoint.sh
deleted file mode 100755
index f34808b..0000000
--- a/eclair-tf-a-3.12/entrypoint.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-echo $1
-
-forwardPorts && \
-postStart
-
-sudo /usr/sbin/setup-sshd $1
-bash
diff --git a/eclair-tf-a-3.12/setup-sshd b/eclair-tf-a-3.12/setup-sshd
deleted file mode 100755
index 1589b1f..0000000
--- a/eclair-tf-a-3.12/setup-sshd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -ex
-
-export HOME=/home/buildslave
-
-[ -z "${JENKINS_SLAVE_SSH_PUBKEY}" ] || {
-  mkdir ${HOME}/.ssh
-  echo "${JENKINS_SLAVE_SSH_PUBKEY}" > ${HOME}/.ssh/authorized_keys
-  chown -R buildslave:buildslave ${HOME}/.ssh
-  chmod 0700 -R ${HOME}/.ssh
-}
-
-ssh-keygen -A
-
-if [ "$1" = "interactive" ]; then
-    /usr/sbin/sshd
-else
-    /usr/sbin/sshd -D
-fi
diff --git a/eclair-tf-a-3.12/tf-environment.install b/eclair-tf-a-3.12/tf-environment.install
deleted file mode 100755
index 2483db9..0000000
--- a/eclair-tf-a-3.12/tf-environment.install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-env | grep ECLAIR_TOP_DIR >> /etc/environment
-env | grep ECLAIR_LICENSE_USER >> /etc/environment
-env | grep PATH >> /etc/environment
diff --git a/eclair-tf-m-3.12/Dockerfile b/eclair-tf-m-3.12/Dockerfile
deleted file mode 100644
index 96ed73a..0000000
--- a/eclair-tf-m-3.12/Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (c) 2021-2022 BUGSENG srl. All rights reserved.
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-
-FROM trustedfirmware/ci-amd64-tf-m-ubuntu:bionic
-
-ARG EclairVersion=3.12.0
-ARG EclairVariant=MC23P1-l64P
-
-ENV ECLAIR_LICENSE_SERVER eclair.trustedfirmware.org
-ENV ECLAIR_LICENSE_USER unguessable
-
-ARG SentinelVersion=8.23.1
-
-ARG SetupDir=/tmp/eclair-${EclairVersion}-${EclairVariant}
-ARG SetupFile=ECLAIR_${EclairVersion}-${EclairVariant}_Setup.run
-
-ENV ECLAIR_TOP_DIR /opt/bugseng/eclair-${EclairVersion}
-ENV DEBIAN_FRONTEND noninteractive
-ENV LANG C.UTF-8
-
-COPY ${SetupFile} /tmp
-
-RUN apt-get update
-
-RUN apt-get -y -q install xz-utils apt-utils socat
-
-RUN cd /tmp && \
-    chmod +x ${SetupFile} && \
-    ./${SetupFile} --keep --noexec
-
-RUN cd /tmp && \
-    tar xzf "${SetupDir}/reqs/Sentinel_LDK_RTE/aksusbd-${SentinelVersion}.tar.gz" && \
-    cd aksusbd-${SentinelVersion} && \
-    ./dinst && \
-    cd .. && \
-    rm -rf aksusbd-${SentinelVersion}
-
-RUN cd ${SetupDir} && \
-    mkdir -m 755 -p "${ECLAIR_TOP_DIR}" && \
-    mv * "${ECLAIR_TOP_DIR}" && \
-    cd "${ECLAIR_TOP_DIR}/.." && \
-    ln -sf "$(basename "${ECLAIR_TOP_DIR}")" eclair && \
-    "${ECLAIR_TOP_DIR}/bin/postinstall.sh"
-
-RUN rm -rf ${SetupDir} && \
-    rm -rf /tmp/${SetupFile}
-
-ENV PATH ${PATH}:${ECLAIR_TOP_DIR}/../bin:${ECLAIR_TOP_DIR}/bin
-
-RUN apt-get install -y -q sudo && \
-    useradd -m eclair -s /bin/bash && \
-    echo "eclair ALL=NOPASSWD: ALL" > /etc/sudoers.d/eclair
-
-
-# Can be overriden at build time
-ENV WORKSPACE "/home/buildslave/workspace/pfalcon-tf-a-eclair"
-
-RUN rm -rf /var/hasplm/storage
-
-RUN apt-get update && \
-    apt-get -y -q --no-install-recommends install \
-    device-tree-compiler \
-    git \
-    make \
-    nano \
-    openjdk-11-jre-headless \
-    openssh-server \
-    python3
-
-COPY tf-*.install /tmp/
-COPY setup-sshd /usr/sbin/setup-sshd
-COPY entrypoint.sh /usr/sbin/entrypoint.sh
-
-RUN bash -ex /tmp/tf-environment.install
-
-
-USER eclair
-
-COPY bin/ /opt/bugseng/bin
-
-EXPOSE 22
-
-ENTRYPOINT ["/usr/sbin/entrypoint.sh"]
diff --git a/eclair-tf-m-3.12/build.sh b/eclair-tf-m-3.12/build.sh
deleted file mode 100755
index 6ea0614..0000000
--- a/eclair-tf-m-3.12/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export LANG=C
-
-tag=$(basename $PWD)
-
-[ -z $ECR ] && echo "Error: ECR environment variable not set" && exit 1
-
-cp ../eclair-linaro/ECLAIR_3.12.0-MC23P1-l64P_Setup.run .
-cp -a ../bin .
-
-image=${ECR}/misra:$tag
-docker build --pull --tag=$image .
-echo $image > .docker-tag
diff --git a/eclair-tf-m-3.12/entrypoint.sh b/eclair-tf-m-3.12/entrypoint.sh
deleted file mode 100755
index f34808b..0000000
--- a/eclair-tf-m-3.12/entrypoint.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-echo $1
-
-forwardPorts && \
-postStart
-
-sudo /usr/sbin/setup-sshd $1
-bash
diff --git a/eclair-tf-m-3.12/setup-sshd b/eclair-tf-m-3.12/setup-sshd
deleted file mode 100755
index 1589b1f..0000000
--- a/eclair-tf-m-3.12/setup-sshd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -ex
-
-export HOME=/home/buildslave
-
-[ -z "${JENKINS_SLAVE_SSH_PUBKEY}" ] || {
-  mkdir ${HOME}/.ssh
-  echo "${JENKINS_SLAVE_SSH_PUBKEY}" > ${HOME}/.ssh/authorized_keys
-  chown -R buildslave:buildslave ${HOME}/.ssh
-  chmod 0700 -R ${HOME}/.ssh
-}
-
-ssh-keygen -A
-
-if [ "$1" = "interactive" ]; then
-    /usr/sbin/sshd
-else
-    /usr/sbin/sshd -D
-fi
diff --git a/eclair-tf-m-3.12/tf-environment.install b/eclair-tf-m-3.12/tf-environment.install
deleted file mode 100755
index 2483db9..0000000
--- a/eclair-tf-m-3.12/tf-environment.install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-env | grep ECLAIR_TOP_DIR >> /etc/environment
-env | grep ECLAIR_LICENSE_USER >> /etc/environment
-env | grep PATH >> /etc/environment
diff --git a/eclair-tf-m-3.13/Dockerfile b/eclair-tf-m-3.13/Dockerfile
index 681924b..6fceaf7 100644
--- a/eclair-tf-m-3.13/Dockerfile
+++ b/eclair-tf-m-3.13/Dockerfile
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-FROM trustedfirmware/ci-amd64-tf-m-ubuntu:bionic
+FROM trustedfirmware/ci-amd64-tf-m-ubuntu:jammy
 
 ARG EclairVersion=3.13.1
 ARG EclairVariant=MC23P1-l64P