diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5057c5a..a203efd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,9 @@ jobs:
           'eclipse-temurin-jammy-17.0.10_7',
           'eclipse-temurin-alpine-22_36',
           'eclipse-temurin-alpine-21.0.2_13',
-          'eclipse-temurin-alpine-17.0.10_7'
+          'eclipse-temurin-alpine-17.0.10_7',
+          'amazoncorretto-21.0.3',
+          'amazoncorretto-17.0.11'
         ]
         include:
           # https://github.com/graalvm/container/pkgs/container/graalvm-community
@@ -72,6 +74,15 @@ jobs:
             dockerfile: 'alpine.Dockerfile'
             baseImageTag: '17.0.10_7-jdk-alpine'
             platforms: 'linux/amd64'
+          # https://hub.docker.com/_/amazoncorretto/tags
+          - javaTag: 'amazoncorretto-21.0.3'
+            dockerContext: 'amazoncorretto'
+            baseImageTag: '21.0.3'
+            platforms: 'linux/amd64'
+          - javaTag: 'amazoncorretto-17.0.11'
+            dockerContext: 'amazoncorretto'
+            baseImageTag: '17.0.11'
+            platforms: 'linux/amd64'
     steps:
     - uses: actions/checkout@v4
     - name: Set up QEMU
diff --git a/README.md b/README.md
index 224b90d..62efb6b 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Images are updated daily
 Available JDK base images:
 * eclipse-temurin
 * graalvm-ce
+* amazoncorretto
 
 ## Where to get images
 
diff --git a/amazoncorretto/Dockerfile b/amazoncorretto/Dockerfile
new file mode 100644
index 0000000..696475c
--- /dev/null
+++ b/amazoncorretto/Dockerfile
@@ -0,0 +1,92 @@
+#
+# Scala and sbt Dockerfile
+#
+# https://github.com/sbt/docker-sbt
+#
+
+# Pull base image
+ARG BASE_IMAGE_TAG
+FROM amazoncorretto:${BASE_IMAGE_TAG:-17.0.6}
+
+# Env variables
+ARG SCALA_VERSION
+ENV SCALA_VERSION ${SCALA_VERSION:-2.13.10}
+ARG SBT_VERSION
+ENV SBT_VERSION ${SBT_VERSION:-1.8.2}
+ARG USER_ID
+ENV USER_ID ${USER_ID:-1001}
+ARG GROUP_ID
+ENV GROUP_ID ${GROUP_ID:-1001}
+
+# Install git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114)
+RUN yum -y update && \
+  yum -y install tar gzip git rpm && \
+  rm -rf /var/cache/yum/* && \
+  yum clean all
+
+# Install sbt
+RUN \
+  curl -fsL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \
+  chown -R root:root /usr/share/sbt && \
+  chmod -R 755 /usr/share/sbt && \
+  ln -s /usr/share/sbt/bin/sbt /usr/local/bin/sbt
+
+# Install Scala
+RUN \
+  case $SCALA_VERSION in \
+    "3"*) URL=https://github.com/lampepfl/dotty/releases/download/$SCALA_VERSION/scala3-$SCALA_VERSION.tar.gz SCALA_DIR=/usr/share/scala3-$SCALA_VERSION ;; \
+    *) URL=https://downloads.typesafe.com/scala/$SCALA_VERSION/scala-$SCALA_VERSION.tgz SCALA_DIR=/usr/share/scala-$SCALA_VERSION ;; \
+  esac && \
+  curl -fsL $URL | tar xfz - -C /usr/share && \
+  mv $SCALA_DIR /usr/share/scala && \
+  chown -R root:root /usr/share/scala && \
+  chmod -R 755 /usr/share/scala && \
+  ln -s /usr/share/scala/bin/* /usr/local/bin && \
+  case $SCALA_VERSION in \
+    "3"*) \
+      echo '@main def main = println(s"Scala library version ${dotty.tools.dotc.config.Properties.versionNumberString}")' > test.scala && \
+      # WORKAROUND: tput: terminal attributes: No such device or address
+      mv /usr/bin/tput /usr/bin/_tput && \
+      scala test.scala && rm test.scala && \
+      mv /usr/bin/_tput /usr/bin/tput ;; \
+    *) \
+      echo "println(util.Properties.versionMsg)" > test.scala && \
+      scala -nocompdaemon test.scala && rm test.scala ;; \
+  esac
+
+# Symlink java to have it available on sbtuser's PATH
+RUN ln -s /opt/java/openjdk/bin/java /usr/local/bin/java
+
+# Add and use user sbtuser
+RUN groupadd --gid $GROUP_ID sbtuser && useradd -m --gid $GROUP_ID --uid $USER_ID sbtuser --shell /bin/bash
+USER sbtuser
+
+# Switch working directory
+WORKDIR /home/sbtuser
+
+# Prepare sbt (warm cache)
+RUN \
+  sbt sbtVersion && \
+  mkdir -p project && \
+  echo "scalaVersion := \"${SCALA_VERSION}\"" > build.sbt && \
+  echo "sbt.version=${SBT_VERSION}" > project/build.properties && \
+  echo "// force sbt compiler-bridge download" > project/Dependencies.scala && \
+  echo "case object Temp" > Temp.scala && \
+  sbt compile && \
+  rm -r project && rm build.sbt && rm Temp.scala && rm -r target
+
+# Link everything into root as well
+# This allows users of this container to choose, whether they want to run the container as sbtuser (non-root) or as root
+USER root
+RUN \
+  ln -s /home/sbtuser/.cache /root/.cache && \
+  ln -s /home/sbtuser/.sbt /root/.sbt && \
+  if [ -d "/home/sbtuser/.ivy2" ]; then ln -s /home/sbtuser/.ivy2 /root/.ivy2; fi
+
+# Switch working directory back to root
+## Users wanting to use this container as non-root should combine the two following arguments
+## -u sbtuser
+## -w /home/sbtuser
+WORKDIR /root
+
+CMD sbt