diff --git a/library/ix-dev/community/minecraft/Chart.yaml b/library/ix-dev/community/minecraft/Chart.yaml
index f2fe5beb89..276589d1d2 100644
--- a/library/ix-dev/community/minecraft/Chart.yaml
+++ b/library/ix-dev/community/minecraft/Chart.yaml
@@ -3,7 +3,7 @@ description: Minecraft is a sandbox game
 annotations:
   title: Minecraft
 type: application
-version: 1.2.9
+version: 1.2.10
 apiVersion: v2
 appVersion: 2024.4.1
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
index 4a7a1e0628..e86961e3df 100644
--- a/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j17alpineImage
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
index 2b0c894941..415022ea25 100644
--- a/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j17gceImage
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
index afdd1628f4..08775917cc 100644
--- a/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j17j9Image
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
index b16af57e30..09e13c04df 100644
--- a/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j17jdkImage
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
index e58967841c..c342f0cfcd 100644
--- a/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j17Image
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
index 649c857e5d..eb48c8e6c3 100644
--- a/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
@@ -5,6 +5,7 @@ mcStorage:
 mcConfig:
   imageSelector: j19Image
   eula: true
+  version: "1.20.4"
 
 mcNetwork:
   serverPort: 30000
diff --git a/library/ix-dev/community/minecraft/ci/java21-alpine-vanila-values.yaml b/library/ix-dev/community/minecraft/ci/java21-alpine-vanila-values.yaml
new file mode 100644
index 0000000000..209d007b83
--- /dev/null
+++ b/library/ix-dev/community/minecraft/ci/java21-alpine-vanila-values.yaml
@@ -0,0 +1,11 @@
+mcStorage:
+  data:
+    type: pvc
+
+mcConfig:
+  imageSelector: j21alpineImage
+  eula: true
+
+mcNetwork:
+  serverPort: 30000
+  rconPort: 30001
diff --git a/library/ix-dev/community/minecraft/ci/java21-graalvm-vanila-values.yaml b/library/ix-dev/community/minecraft/ci/java21-graalvm-vanila-values.yaml
new file mode 100644
index 0000000000..ff2a4f4ed8
--- /dev/null
+++ b/library/ix-dev/community/minecraft/ci/java21-graalvm-vanila-values.yaml
@@ -0,0 +1,11 @@
+mcStorage:
+  data:
+    type: pvc
+
+mcConfig:
+  imageSelector: j21gImage
+  eula: true
+
+mcNetwork:
+  serverPort: 30000
+  rconPort: 30001
diff --git a/library/ix-dev/community/minecraft/ci/java21-vanila-values.yaml b/library/ix-dev/community/minecraft/ci/java21-vanila-values.yaml
new file mode 100644
index 0000000000..d2834069fe
--- /dev/null
+++ b/library/ix-dev/community/minecraft/ci/java21-vanila-values.yaml
@@ -0,0 +1,11 @@
+mcStorage:
+  data:
+    type: pvc
+
+mcConfig:
+  imageSelector: j21Image
+  eula: true
+
+mcNetwork:
+  serverPort: 30000
+  rconPort: 30001
diff --git a/library/ix-dev/community/minecraft/questions.yaml b/library/ix-dev/community/minecraft/questions.yaml
index e440bd8c1c..c2e6e70872 100644
--- a/library/ix-dev/community/minecraft/questions.yaml
+++ b/library/ix-dev/community/minecraft/questions.yaml
@@ -71,6 +71,12 @@ questions:
                 description: Java 17 HotSpot (Alpine)
               - value: j19Image
                 description: Java 19 HotSpot (Ubuntu)
+              - value: j21Image
+                description: Java 21 HotSpot (Ubuntu)
+              - value: j21gImage
+                description: Java 21 GraalVM (Oracle)
+              - value: j21alpineImage
+                description: Java 21 HotSpot (Alpine)
         - variable: type
           label: Type
           description: |
diff --git a/library/ix-dev/community/minecraft/upgrade_strategy b/library/ix-dev/community/minecraft/upgrade_strategy
index e389413c0e..9a1ef3bac5 100755
--- a/library/ix-dev/community/minecraft/upgrade_strategy
+++ b/library/ix-dev/community/minecraft/upgrade_strategy
@@ -58,6 +58,18 @@ ENUMS = {
     'j19Image': {
         'RE_STABLE_VERSION': re.compile(rf'{RE_STABLE_VERSION_BASE}-java19'),
         'STRIP_TEXT': '-java19'
+    },
+    'j21Image': {
+        'RE_STABLE_VERSION': re.compile(rf'{RE_STABLE_VERSION_BASE}-java21'),
+        'STRIP_TEXT': '-java21'
+    },
+    'j21gImage': {
+        'RE_STABLE_VERSION': re.compile(rf'{RE_STABLE_VERSION_BASE}-java21-graalvm'),
+        'STRIP_TEXT': '-java21-graalvm'
+    },
+    'j21alpineImage': {
+        'RE_STABLE_VERSION': re.compile(rf'{RE_STABLE_VERSION_BASE}-java21-alpine'),
+        'STRIP_TEXT': '-java21-alpine'
     }
 }
 
diff --git a/library/ix-dev/community/minecraft/values.yaml b/library/ix-dev/community/minecraft/values.yaml
index 478637ead9..8bc3268431 100644
--- a/library/ix-dev/community/minecraft/values.yaml
+++ b/library/ix-dev/community/minecraft/values.yaml
@@ -50,6 +50,18 @@ j19Image:
   repository: itzg/minecraft-server
   pullPolicy: IfNotPresent
   tag: 2023.3.0-java19
+j21Image:
+  repository: itzg/minecraft-server
+  pullPolicy: IfNotPresent
+  tag: 2024.4.1-java21
+j21gImage:
+  repository: itzg/minecraft-server
+  pullPolicy: IfNotPresent
+  tag: 2024.4.1-java21-graalvm
+j21alpineImage:
+  repository: itzg/minecraft-server
+  pullPolicy: IfNotPresent
+  tag: 2024.4.1-java21-alpine
 
 resources:
   limits: