diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml
index 31f1488..109534d 100644
--- a/.github/workflows/verify-images.yml
+++ b/.github/workflows/verify-images.yml
@@ -100,7 +100,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ 8, 11, 17, 21, 23 ]
-        os_version: ["3.17", "3.18", "3.19", "3.20"]
+        os_version: ["3.18", "3.19", "3.20", "3.21"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/11/jdk/alpine/3.17/Dockerfile b/11/jdk/alpine/3.21/Dockerfile
similarity index 98%
rename from 11/jdk/alpine/3.17/Dockerfile
rename to 11/jdk/alpine/3.21/Dockerfile
index 7b72910..321308e 100644
--- a/11/jdk/alpine/3.17/Dockerfile
+++ b/11/jdk/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=11.0.25.9.1
 
diff --git a/17/jdk/alpine/3.17/Dockerfile b/17/jdk/alpine/3.21/Dockerfile
similarity index 98%
rename from 17/jdk/alpine/3.17/Dockerfile
rename to 17/jdk/alpine/3.21/Dockerfile
index 38c0b5e..c53a499 100644
--- a/17/jdk/alpine/3.17/Dockerfile
+++ b/17/jdk/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=17.0.13.11.1
 
diff --git a/21/jdk/alpine/3.17/Dockerfile b/21/jdk/alpine/3.21/Dockerfile
similarity index 98%
rename from 21/jdk/alpine/3.17/Dockerfile
rename to 21/jdk/alpine/3.21/Dockerfile
index 9997f77..79a9978 100644
--- a/21/jdk/alpine/3.17/Dockerfile
+++ b/21/jdk/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=21.0.5.11.1
 
diff --git a/23/jdk/alpine/3.17/Dockerfile b/23/jdk/alpine/3.21/Dockerfile
similarity index 98%
rename from 23/jdk/alpine/3.17/Dockerfile
rename to 23/jdk/alpine/3.21/Dockerfile
index b10f190..72296b2 100644
--- a/23/jdk/alpine/3.17/Dockerfile
+++ b/23/jdk/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=23.0.1.8.1
 
diff --git a/8/jdk/alpine/3.17/Dockerfile b/8/jdk/alpine/3.21/Dockerfile
similarity index 98%
rename from 8/jdk/alpine/3.17/Dockerfile
rename to 8/jdk/alpine/3.21/Dockerfile
index 7017f32..4a173e2 100644
--- a/8/jdk/alpine/3.17/Dockerfile
+++ b/8/jdk/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=8.432.06.1
 
diff --git a/8/jre/alpine/3.17/Dockerfile b/8/jre/alpine/3.21/Dockerfile
similarity index 98%
rename from 8/jre/alpine/3.17/Dockerfile
rename to 8/jre/alpine/3.21/Dockerfile
index 1ad430b..ad9d85b 100644
--- a/8/jre/alpine/3.17/Dockerfile
+++ b/8/jre/alpine/3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.21
 
 ARG version=8.432.06.1
 
diff --git a/bin/apply-template.py b/bin/apply-template.py
index d87852a..7764cf9 100755
--- a/bin/apply-template.py
+++ b/bin/apply-template.py
@@ -13,7 +13,7 @@ def process_template_files(major_version, version, platform):
     input_parameter['MAJOR_VERSION'] = major_version
     if platform == 'alpine':
         # Update .github/workflows/verify-images.yml as well when alpine versions changes
-        os_versions = ['3.17', '3.18', '3.19', '3.20']
+        os_versions = ['3.18', '3.19', '3.20', '3.21']
     try:
         shutil.rmtree(f"{major_version}/jdk/{platform}")
         shutil.rmtree(f"{major_version}/jre/{platform}")
diff --git a/bin/tag-generator.py b/bin/tag-generator.py
index e9e19c6..92ab0e9 100755
--- a/bin/tag-generator.py
+++ b/bin/tag-generator.py
@@ -1,7 +1,7 @@
 import json
 
-DEFAULT_ALPINE_VERSION = '3.20'
-ALPINE_VERSIONS = ['3.17', '3.18', '3.19', '3.20']
+DEFAULT_ALPINE_VERSION = '3.21'
+ALPINE_VERSIONS = ['3.18', '3.19', '3.20', '3.21']
 
 def generate_tags(key, version):
     update = version.split('.')[1] if (key == '8') else version.split('.')[2]