diff --git a/.github/workflows/alpine.yaml b/.github/workflows/alpine.yaml
index c0291e03..1d5d51ec 100644
--- a/.github/workflows/alpine.yaml
+++ b/.github/workflows/alpine.yaml
@@ -21,7 +21,7 @@ on:
 env:
   distro: 'alpine'
   distro_pretty: 'Alpine Linux'
-  latest_release: '3.20'
+  latest_release: '3.21'
   platforms: 'linux/amd64, linux/arm64'
   registry: 'quay.io/toolbx-images'
 
@@ -36,7 +36,7 @@ jobs:
   build-push-images:
     strategy:
       matrix:
-        release: ['3.18', '3.19', '3.20', 'edge']
+        release: ['3.18', '3.19', '3.20', '3.21', 'edge']
 
     runs-on: ubuntu-24.04
     steps:
diff --git a/alpine/3.21/Containerfile b/alpine/3.21/Containerfile
new file mode 100644
index 00000000..586baec4
--- /dev/null
+++ b/alpine/3.21/Containerfile
@@ -0,0 +1,24 @@
+FROM docker.io/library/alpine:3.21
+
+LABEL com.github.containers.toolbox="true" \
+      name="alpine-toolbox" \
+      version="3.21" \
+      usage="This image is meant to be used with the toolbox command" \
+      summary="Base image for creating Alpine Linux toolbox containers" \
+      maintainer="Jorge O. Castro <jorge.castro@gmail.com>"
+
+# Install extra packages
+COPY extra-packages /
+RUN apk update && \
+    apk upgrade && \
+    cat /extra-packages | xargs apk add
+RUN rm /extra-packages
+
+# Enable password less sudo
+RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/toolbox
+
+# Copy the os-release file
+RUN cp -p /etc/os-release /usr/lib/os-release
+
+# Clear out /media
+RUN rm -rf /media
diff --git a/alpine/3.21/extra-packages b/alpine/3.21/extra-packages
new file mode 100644
index 00000000..0876cf39
--- /dev/null
+++ b/alpine/3.21/extra-packages
@@ -0,0 +1,37 @@
+alpine-base
+bash
+bash-completion
+bc
+bzip2
+coreutils
+curl
+diffutils
+docs
+findutils
+gcompat
+git
+gnupg
+iproute2
+iputils
+keyutils
+less
+libcap
+man-pages
+mandoc
+musl-utils
+ncurses-terminfo
+net-tools
+openssh-client
+procps
+rsync
+shadow
+sudo
+tar
+tcpdump
+tree
+unzip
+util-linux
+wget
+which
+xz
+zip