diff --git a/.drone.star b/.drone.star
index fafb7914..1ab665c3 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,6 +1,7 @@
 def main(ctx):
     versions = [
         "latest",
+        "22",
         "20",
         "18",
         "16",
diff --git a/README.md b/README.md
index ec8565e7..3b752b95 100644
--- a/README.md
+++ b/README.md
@@ -15,5 +15,5 @@ This project is licensed under the MIT License - see the [LICENSE](https://githu
 ## Copyright
 
 ```Text
-Copyright (c) 2022 ownCloud GmbH
+Copyright (c) 2024 ownCloud GmbH
 ```
diff --git a/v22/Dockerfile.amd64 b/v22/Dockerfile.amd64
new file mode 100644
index 00000000..909c1d2f
--- /dev/null
+++ b/v22/Dockerfile.amd64
@@ -0,0 +1,37 @@
+FROM owncloud/ubuntu:20.04-amd64@sha256:de7decaa013d5933c855ed2475c36b3d5991a821e847da4be2ceeecb68f3093d
+
+LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
+  org.opencontainers.image.title="ownCloud CI NodeJS" \
+  org.opencontainers.image.vendor="ownCloud GmbH" \
+  org.opencontainers.image.authors="ownCloud GmbH" \
+  org.opencontainers.image.description="ownCloud CI NodeJS" \
+  org.opencontainers.image.documentation="https://github.com/owncloud-ci/nodejs.git" \
+  org.opencontainers.image.url="https://github.com/owncloud-ci/nodejs" \
+  org.opencontainers.image.source="https://github.com/owncloud-ci/nodejs"
+
+ARG RETRY_VERSION
+
+# renovate: datasource=github-releases depName=owncloud-ci/retry
+ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}"
+# renovate: datasource=npm depName=pnpm
+ENV PNPM_VERSION="${PNPM_VERSION:-9.12.3}"
+
+VOLUME ["/var/www/owncloud"]
+
+RUN apt-get update -y && \
+  apt-get install -y gettext git-core build-essential libfontconfig libpng16-16 lsb-release firefox && \
+  curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \
+  chmod 755 /usr/local/bin/retry && \
+  curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+  curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+  apt-get update -y && \
+  apt-get install -y nodejs=22.11.0-1nodesource1 && \
+  wget -q -P /tmp https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
+  apt install -y /tmp/google-chrome-stable_current_amd64.deb && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN npm install --silent -g yarn npx "pnpm@$PNPM_VERSION" --force
+
+COPY rootfs /
+WORKDIR /var/www/owncloud
diff --git a/v22/Dockerfile.arm64v8 b/v22/Dockerfile.arm64v8
new file mode 100644
index 00000000..3b04a975
--- /dev/null
+++ b/v22/Dockerfile.arm64v8
@@ -0,0 +1,35 @@
+FROM owncloud/ubuntu:20.04-arm64v8@sha256:f2bf53708c8e5393371e106e621e8b458557da2bf7d056a79dc3b3a1ad98cb06
+
+LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
+  org.opencontainers.image.title="ownCloud CI NodeJS" \
+  org.opencontainers.image.vendor="ownCloud GmbH" \
+  org.opencontainers.image.authors="ownCloud GmbH" \
+  org.opencontainers.image.description="ownCloud CI NodeJS" \
+  org.opencontainers.image.documentation="https://github.com/owncloud-ci/nodejs.git" \
+  org.opencontainers.image.url="https://github.com/owncloud-ci/nodejs" \
+  org.opencontainers.image.source="https://github.com/owncloud-ci/nodejs"
+
+ARG RETRY_VERSION
+
+# renovate: datasource=github-releases depName=owncloud-ci/retry
+ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}"
+# renovate: datasource=npm depName=pnpm
+ENV PNPM_VERSION="${PNPM_VERSION:-9.12.3}"
+
+VOLUME ["/var/www/owncloud"]
+
+RUN apt-get update -y && \
+  apt-get install -y gettext git-core build-essential libfontconfig libpng16-16 lsb-release firefox && \
+  curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \
+  chmod 755 /usr/local/bin/retry && \
+  curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+  curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+  apt-get update -y && \
+  apt-get install -y nodejs=22.11.0-1nodesource1 && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN npm install --silent -g yarn npx "pnpm@$PNPM_VERSION" --force
+
+COPY rootfs /
+WORKDIR /var/www/owncloud
diff --git a/v22/manifest.tmpl b/v22/manifest.tmpl
new file mode 100644
index 00000000..0390a6d4
--- /dev/null
+++ b/v22/manifest.tmpl
@@ -0,0 +1,11 @@
+image: owncloudci/nodejs:22
+manifests:
+  - image: owncloudci/nodejs:22-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: owncloudci/nodejs:22-arm64v8
+    platform:
+      architecture: arm64
+      variant: v8
+      os: linux
diff --git a/v22/rootfs/.keep b/v22/rootfs/.keep
new file mode 100644
index 00000000..e69de29b