diff --git a/.allstar/binary_artifacts.yaml b/.allstar/binary_artifacts.yaml
new file mode 100644
index 0000000000..0b70480559
--- /dev/null
+++ b/.allstar/binary_artifacts.yaml
@@ -0,0 +1,4 @@
+# Ignore reason: jars are used for testing purposes only
+ignorePaths:
+  - jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/libs/dependency-1.0.0.jar
+  - jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/libs/dependency-1.0.0.jar
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
index 73c5bbeffe..804b3a3f1e 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -8,7 +8,13 @@ assignees: ''
 ---
 
 <!--
-Before filing an issue, please reproduce with the latest version of Jib.
+Please follow the guidelines below before opening an issue:
+1. Ensure the issue was not already reported. 
+2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. 
+4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
+
+Please reproduce with the latest version of Jib.
 
 If you are encountering errors pulling or pushing to remote registries,
 please check our Frequently Asked Questions before filing an issue:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c30fc7d966..f47aa2784e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,14 +1,12 @@
 Thank you for your interest in contributing! For general guidelines, please refer to
 the [contributing guide](https://github.com/GoogleContainerTools/jib/blob/master/CONTRIBUTING.md).
 
-Before filing a pull request, make sure to do the following:
-
-- [ ] Create a new issue at https://github.com/GoogleContainerTools/jib/issues/new/choose.
-- [ ] Ensure that your implementation plan is approved by the team.
+Please follow the guidelines below before opening an issue or a PR:
+- [ ] Ensure the issue was not already reported. 
+- [ ] Create a new issue at https://github.com/GoogleContainerTools/jib/issues/new/choose if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+- [ ] Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions.
+- [ ] Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
 - [ ] Verify that integration tests and unit tests are passing after the change.
-- [ ] Address all checkstyle issues. Refer to
-  the [style guide](https://github.com/GoogleContainerTools/jib/blob/master/STYLE_GUIDE.md).
-
-This helps to reduce the chance of having a pull request rejected.
+- [ ] Address all checkstyle issues. Refer to the [style guide](https://github.com/GoogleContainerTools/jib/blob/master/STYLE_GUIDE.md).
 
 Fixes #<issue_number_goes_here> 🛠️
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 481284fa9d..aad54536bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,13 @@
+
+This project is currently stable, and we are primarily focused on critical bug fixes and platform evolution to ensure it continues to work for its supported use cases.
+
 # Contributing to Jib
 
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
+Please follow the guidelines below before opening an issue or a PR:
+1. Ensure the issue was not already reported. 
+2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. 
+4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
 
 ## Contributor License Agreement
 
diff --git a/build.gradle b/build.gradle
index a8ec1fe552..32f6f02523 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ project.ext.dependencyStrings = [
   GRADLE_EXTENSION: 'com.google.cloud.tools:jib-gradle-plugin-extension-api:0.4.0',
   MAVEN_EXTENSION: 'com.google.cloud.tools:jib-maven-plugin-extension-api:0.4.0',
 
-  COMMONS_COMPRESS: 'org.apache.commons:commons-compress:1.21',
+  COMMONS_COMPRESS: 'org.apache.commons:commons-compress:1.26.0',
   ZSTD_JNI: 'com.github.luben:zstd-jni:1.5.5-5',
   COMMONS_TEXT: 'org.apache.commons:commons-text:1.10.0',
   JACKSON_BOM: 'com.fasterxml.jackson:jackson-bom:2.15.2',
@@ -371,7 +371,7 @@ subprojects {
   // sourceProject(Project) accepts a project and adds it as a dependency in a special manner:
   // 1. force evaluation of the project first
   // 2. add the project classes as "compileOnly" and make it available to tests in "testImplementation"
-  // 3. add the project's depedencies as "implementation"
+  // 3. add the project's dependencies as "implementation"
   // 4. remove any transitive reference of any sourceProject depenency that may have appeared
   // 5. add the project's classes to the final jar
   // Other nice effects (vs shadowJar)
diff --git a/docs/google-cloud-build.md b/docs/google-cloud-build.md
index b2679ff5e2..71d779bdaa 100644
--- a/docs/google-cloud-build.md
+++ b/docs/google-cloud-build.md
@@ -13,7 +13,7 @@ Any Java container can be used for building, not only the `gcr.io/cloud-builders
 
 ```yaml
 steps:
-  - name: 'docker.io/library/eclipse-temurin:17'
+  - name: 'docker.io/library/eclipse-temurin:21'
     entrypoint: './gradlew'
     args: ['--console=plain', '--no-daemon', ':server:jib', '-Djib.to.image=gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA']
 ```
diff --git a/docs/privacy.md b/docs/privacy.md
index 28a81303a5..c0c78b3dc8 100644
--- a/docs/privacy.md
+++ b/docs/privacy.md
@@ -11,7 +11,7 @@ and version.
 ### How to disable update checks
 
 1. set the `jib.disableUpdateChecks` system property to `true`
-2. set `disableUpdateChecks` to `true` in Jib's global config. The global config is in the following locations by default:
+2. set `disableUpdateCheck` to `true` in Jib's global config. The global config is in the following locations by default:
     * Linux: `$XDG_CONFIG_HOME/google-cloud-tools-java/jib/config.json` (if `$XDG_CONFIG_HOME` is defined), else `$HOME/.config/google-cloud-tools-java/jib/config.json`
     * Mac: `$XDG_CONFIG_HOME/Google/Jib/config.json` (if `$XDG_CONFIG_HOME` is defined), else `$HOME/Library/Preferences/Google/Jib/config.json`
     * Windows: `$XDG_CONFIG_HOME\Google\Jib\Config\config.json` (if `$XDG_CONFIG_HOME` is defined), else `%LOCALAPPDATA%\Google\Jib\Config\config.json`
\ No newline at end of file
diff --git a/examples/dropwizard/pom.xml b/examples/dropwizard/pom.xml
index 69dbb4734a..4a4e1f167f 100644
--- a/examples/dropwizard/pom.xml
+++ b/examples/dropwizard/pom.xml
@@ -26,7 +26,7 @@
         <dropwizard-template-config.version>1.5.0</dropwizard-template-config.version>
 
         <jib.container.appRoot>/app</jib.container.appRoot>
-        <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/examples/helloworld/build.gradle b/examples/helloworld/build.gradle
index 2e9e5a3a7c..4a5e74232e 100644
--- a/examples/helloworld/build.gradle
+++ b/examples/helloworld/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'com.google.cloud.tools.jib' version '3.4.0'
+  id 'com.google.cloud.tools.jib' version '3.4.1'
 }
 
 sourceCompatibility = 1.8
diff --git a/examples/helloworld/pom.xml b/examples/helloworld/pom.xml
index 6e32892acf..a91b885bb7 100644
--- a/examples/helloworld/pom.xml
+++ b/examples/helloworld/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
   </properties>
 
diff --git a/examples/java-agent/build.gradle b/examples/java-agent/build.gradle
index cb2aa713df..5c14bbacc8 100644
--- a/examples/java-agent/build.gradle
+++ b/examples/java-agent/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'com.google.cloud.tools.jib' version '3.4.0'
+  id 'com.google.cloud.tools.jib' version '3.4.1'
   id 'de.undercouch.download' version '4.0.0'
   id 'com.gorylenko.gradle-git-properties' version '2.2.0'
 }
diff --git a/examples/java-agent/pom.xml b/examples/java-agent/pom.xml
index 1054860b50..9c888cc209 100644
--- a/examples/java-agent/pom.xml
+++ b/examples/java-agent/pom.xml
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     <download-maven-plugin.version>1.4.2</download-maven-plugin.version>
     <git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>
diff --git a/examples/ktor/build.gradle.kts b/examples/ktor/build.gradle.kts
index ce14dac8f8..aa300a358c 100644
--- a/examples/ktor/build.gradle.kts
+++ b/examples/ktor/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     application
     kotlin("jvm") version "1.3.10"
-    id("com.google.cloud.tools.jib") version "3.4.0"
+    id("com.google.cloud.tools.jib") version "3.4.1"
 }
 
 group = "example"
diff --git a/examples/micronaut/build.gradle b/examples/micronaut/build.gradle
index b406ada255..f8870dfa15 100644
--- a/examples/micronaut/build.gradle
+++ b/examples/micronaut/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "groovy"
     id "com.github.johnrengelman.shadow" version "5.2.0"
     id "application"
-    id 'com.google.cloud.tools.jib' version '3.4.0'
+    id 'com.google.cloud.tools.jib' version '3.4.1'
 }
 
 version "0.1"
diff --git a/examples/multi-module/build.gradle b/examples/multi-module/build.gradle
index 613964aec9..4c5b0c406d 100644
--- a/examples/multi-module/build.gradle
+++ b/examples/multi-module/build.gradle
@@ -2,5 +2,5 @@
 plugins {
   id 'org.springframework.boot' version '2.0.3.RELEASE' apply false
   id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
-  id 'com.google.cloud.tools.jib' version '3.4.0' apply false
+  id 'com.google.cloud.tools.jib' version '3.4.1' apply false
 }
diff --git a/examples/multi-module/pom.xml b/examples/multi-module/pom.xml
index 99fccebbd3..d4623fddc7 100644
--- a/examples/multi-module/pom.xml
+++ b/examples/multi-module/pom.xml
@@ -41,7 +41,7 @@
         <plugin>
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.4.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle
index 50b0351a54..de0f8530f6 100644
--- a/examples/spring-boot/build.gradle
+++ b/examples/spring-boot/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'org.springframework.boot' version '2.1.6.RELEASE'
     id 'io.spring.dependency-management' version '1.0.6.RELEASE'
-    id 'com.google.cloud.tools.jib' version '3.4.0'
+    id 'com.google.cloud.tools.jib' version '3.4.1'
 }
 
 repositories {
diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml
index b4b570aa7b..37a5c3a6a6 100644
--- a/examples/spring-boot/pom.xml
+++ b/examples/spring-boot/pom.xml
@@ -29,7 +29,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
             </plugin>
         </plugins>
     </build>
diff --git a/examples/vertx/build.gradle b/examples/vertx/build.gradle
index 1f069b28e1..fb31b56708 100644
--- a/examples/vertx/build.gradle
+++ b/examples/vertx/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'io.vertx.vertx-plugin' version '0.1.0'
-    id 'com.google.cloud.tools.jib' version '3.4.0'
+    id 'com.google.cloud.tools.jib' version '3.4.1'
 }
 
 repositories {
diff --git a/jib-cli/src/integration-test/java/com/google/cloud/tools/jib/cli/JarCommandTest.java b/jib-cli/src/integration-test/java/com/google/cloud/tools/jib/cli/JarCommandTest.java
index 6b557196f2..d1c2bce75b 100644
--- a/jib-cli/src/integration-test/java/com/google/cloud/tools/jib/cli/JarCommandTest.java
+++ b/jib-cli/src/integration-test/java/com/google/cloud/tools/jib/cli/JarCommandTest.java
@@ -20,18 +20,32 @@
 
 import com.google.cloud.tools.jib.Command;
 import com.google.cloud.tools.jib.api.HttpRequestTester;
+import com.google.common.base.Preconditions;
 import com.google.common.io.Resources;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
 import javax.annotation.Nullable;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
 import org.junit.After;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import picocli.CommandLine;
@@ -43,6 +57,15 @@ public class JarCommandTest {
 
   @Nullable private String containerName;
 
+  @BeforeClass
+  public static void createJars() throws IOException, URISyntaxException {
+    createJarFile(
+        "jarWithCp.jar", "HelloWorld", "dependency1.jar directory/dependency2.jar", "HelloWorld");
+    createJarFile("noDependencyJar.jar", "HelloWorld", null, "HelloWorld");
+    createJarFile("dependency1.jar", "dep/A", null, null);
+    createJarFile("directory/dependency2.jar", "dep2/B", null, null);
+  }
+
   @After
   public void tearDown() throws IOException, InterruptedException {
     if (containerName != null) {
@@ -315,4 +338,47 @@ public void testJar_baseImageSpecified()
     String output = new Command("docker", "run", "--rm", "cli-gcr-base").run();
     assertThat(output).isEqualTo("Hello World");
   }
+
+  public static void createJarFile(
+      String name, String className, String classPath, String mainClass)
+      throws IOException, URISyntaxException {
+    Path javaFilePath =
+        Paths.get(Resources.getResource("jarTest/standard/" + className + ".java").toURI());
+    Path workingDir = Paths.get(Resources.getResource("jarTest/standard/").toURI());
+
+    // compile the java file
+    JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    Preconditions.checkNotNull(compiler);
+    StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
+    Iterable<? extends JavaFileObject> compilationUnits =
+        fileManager.getJavaFileObjectsFromFiles(Collections.singletonList(javaFilePath.toFile()));
+    Iterable<String> options = Arrays.asList("-source", "1.8", "-target", "1.8");
+    JavaCompiler.CompilationTask task =
+        compiler.getTask(null, fileManager, null, options, null, compilationUnits);
+    boolean success = task.call();
+    assertThat(success).isTrue();
+
+    // Create a manifest file
+    Manifest manifest = new Manifest();
+    Attributes attributes = new Attributes();
+    attributes.putValue("Manifest-Version", "1.0");
+    if (classPath != null) {
+      attributes.putValue("Class-Path", classPath);
+    }
+    if (mainClass != null) {
+      attributes.putValue("Main-Class", mainClass);
+    }
+    manifest.getMainAttributes().putAll(attributes);
+
+    // Create JAR
+    File jarFile = workingDir.resolve(name).toFile();
+    jarFile.getParentFile().mkdirs();
+    try (FileOutputStream fileOutputStream = new FileOutputStream(jarFile);
+        JarOutputStream jarOutputStream = new JarOutputStream(fileOutputStream, manifest)) {
+      ZipEntry zipEntry = new ZipEntry(className + ".class");
+      jarOutputStream.putNextEntry(zipEntry);
+      jarOutputStream.write(Files.readAllBytes(workingDir.resolve(className + ".class")));
+      jarOutputStream.closeEntry();
+    }
+  }
 }
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/HelloWorld.java b/jib-cli/src/integration-test/resources/jarTest/standard/HelloWorld.java
new file mode 100644
index 0000000000..558d6f9908
--- /dev/null
+++ b/jib-cli/src/integration-test/resources/jarTest/standard/HelloWorld.java
@@ -0,0 +1,5 @@
+public class HelloWorld {
+  public static void main(String[] args) {
+    System.out.print("Hello World");
+  }
+}
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/dep/A.java b/jib-cli/src/integration-test/resources/jarTest/standard/dep/A.java
new file mode 100644
index 0000000000..96d933ef79
--- /dev/null
+++ b/jib-cli/src/integration-test/resources/jarTest/standard/dep/A.java
@@ -0,0 +1,7 @@
+package dep;
+
+public class A {
+  public static void getResult() {
+    System.out.print("Hello ");
+  }
+}
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/dep2/B.java b/jib-cli/src/integration-test/resources/jarTest/standard/dep2/B.java
new file mode 100644
index 0000000000..41ff5a9aa4
--- /dev/null
+++ b/jib-cli/src/integration-test/resources/jarTest/standard/dep2/B.java
@@ -0,0 +1,7 @@
+package dep2;
+
+public class B {
+  public static void getResult() {
+    System.out.print("World");
+  }
+}
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/dependency1.jar b/jib-cli/src/integration-test/resources/jarTest/standard/dependency1.jar
deleted file mode 100644
index 84b923b25b..0000000000
Binary files a/jib-cli/src/integration-test/resources/jarTest/standard/dependency1.jar and /dev/null differ
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/directory/dependency2.jar b/jib-cli/src/integration-test/resources/jarTest/standard/directory/dependency2.jar
deleted file mode 100644
index 79583ea652..0000000000
Binary files a/jib-cli/src/integration-test/resources/jarTest/standard/directory/dependency2.jar and /dev/null differ
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/jarWithCp.jar b/jib-cli/src/integration-test/resources/jarTest/standard/jarWithCp.jar
deleted file mode 100644
index 0ae4bd379a..0000000000
Binary files a/jib-cli/src/integration-test/resources/jarTest/standard/jarWithCp.jar and /dev/null differ
diff --git a/jib-cli/src/integration-test/resources/jarTest/standard/noDependencyJar.jar b/jib-cli/src/integration-test/resources/jarTest/standard/noDependencyJar.jar
deleted file mode 100644
index 754cd1ba2e..0000000000
Binary files a/jib-cli/src/integration-test/resources/jarTest/standard/noDependencyJar.jar and /dev/null differ
diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarFiles.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarFiles.java
index 7c59cf86da..ca06fdc273 100644
--- a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarFiles.java
+++ b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/jar/JarFiles.java
@@ -89,6 +89,9 @@ private static String getDefaultBaseImage(ArtifactProcessor processor) {
     if (processor.getJavaVersion() <= 11) {
       return "eclipse-temurin:11-jre";
     }
-    return "eclipse-temurin:17-jre";
+    if (processor.getJavaVersion() <= 17) {
+      return "eclipse-temurin:17-jre";
+    }
+    return "eclipse-temurin:21-jre";
   }
 }
diff --git a/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/JarFilesTest.java b/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/JarFilesTest.java
index 3775aeb13b..225d242ca0 100644
--- a/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/JarFilesTest.java
+++ b/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/jar/JarFilesTest.java
@@ -72,6 +72,7 @@ public class JarFilesTest {
         "11, eclipse-temurin:11-jre",
         "13, eclipse-temurin:17-jre",
         "17, eclipse-temurin:17-jre",
+        "21, eclipse-temurin:21-jre",
       })
   public void testToJibContainer_defaultBaseImage(int javaVersion, String expectedBaseImage)
       throws IOException, InvalidImageReferenceException {
diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md
index 06e4e37f27..32b9adcabb 100644
--- a/jib-core/CHANGELOG.md
+++ b/jib-core/CHANGELOG.md
@@ -7,7 +7,12 @@ All notable changes to this project will be documented in this file.
 -
 
 ### Changed
--
+- deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+### Fixed
+- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+## 0.26.0
 
 ### Fixed
 - fix: support parsing manifest JSON containing `LayerSources:` from latest Docker. ([#4171](https://github.com/GoogleContainerTools/jib/pull/4171))
diff --git a/jib-core/README.md b/jib-core/README.md
index b1ec587e36..81cd0b1f77 100644
--- a/jib-core/README.md
+++ b/jib-core/README.md
@@ -22,7 +22,7 @@ Add Jib Core as a dependency using Maven:
 <dependency>
   <groupId>com.google.cloud.tools</groupId>
   <artifactId>jib-core</artifactId>
-  <version>0.25.0</version>
+  <version>0.26.0</version>
 </dependency>
 ```
 
diff --git a/jib-core/gradle.properties b/jib-core/gradle.properties
index a5c92495e5..0535c30ed4 100644
--- a/jib-core/gradle.properties
+++ b/jib-core/gradle.properties
@@ -1 +1 @@
-version = 0.25.1-SNAPSHOT
+version = 0.26.1-SNAPSHOT
diff --git a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/api/ReproducibleImageTest.java b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/api/ReproducibleImageTest.java
index 1c194b2198..9351974634 100644
--- a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/api/ReproducibleImageTest.java
+++ b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/api/ReproducibleImageTest.java
@@ -102,9 +102,9 @@ public void testTarballStructure() throws IOException {
 
     assertThat(actual)
         .containsExactly(
-            "c46572ef74f58d95e44dd36c1fbdfebd3752e8b56a794a13c11cfed35a1a6e1c.tar.gz",
-            "6d2763b0f3940d324ea6b55386429e5b173899608abf7d1bff62e25dd2e4dcea.tar.gz",
-            "530c1954a2b087d0b989895ea56435c9dc739a973f2d2b6cb9bb98e55bbea7ac.tar.gz",
+            "98682a867906d9d07cf3c51a4fb9e08e9d5baddd1ca5dc7834f58f434c9cb15c.tar.gz",
+            "527db49d4e0c4159346119b4971d59016bfedceed874abab2b510ce433f6b15c.tar.gz",
+            "16d03883198935b4119896dcea0ea14e1bf105b6ac0a35a88820d08bc0263306.tar.gz",
             "config.json",
             "manifest.json")
         .inOrder();
@@ -114,7 +114,7 @@ public void testTarballStructure() throws IOException {
   public void testManifest() throws IOException {
     String expectedManifest =
         "[{\"Config\":\"config.json\",\"RepoTags\":[\"jib-core/reproducible:latest\"],"
-            + "\"Layers\":[\"c46572ef74f58d95e44dd36c1fbdfebd3752e8b56a794a13c11cfed35a1a6e1c.tar.gz\",\"6d2763b0f3940d324ea6b55386429e5b173899608abf7d1bff62e25dd2e4dcea.tar.gz\",\"530c1954a2b087d0b989895ea56435c9dc739a973f2d2b6cb9bb98e55bbea7ac.tar.gz\"]}]";
+            + "\"Layers\":[\"98682a867906d9d07cf3c51a4fb9e08e9d5baddd1ca5dc7834f58f434c9cb15c.tar.gz\",\"527db49d4e0c4159346119b4971d59016bfedceed874abab2b510ce433f6b15c.tar.gz\",\"16d03883198935b4119896dcea0ea14e1bf105b6ac0a35a88820d08bc0263306.tar.gz\"]}]";
     String generatedManifest = extractFromTarFileAsString(imageTar, "manifest.json");
     assertThat(generatedManifest).isEqualTo(expectedManifest);
   }
@@ -125,7 +125,7 @@ public void testConfiguration() throws IOException {
         "{\"created\":\"1970-01-01T00:00:00Z\",\"architecture\":\"amd64\",\"os\":\"linux\","
             + "\"config\":{\"Env\":[],\"Entrypoint\":[\"echo\",\"Hello World\"],\"ExposedPorts\":{},\"Labels\":{},\"Volumes\":{}},"
             + "\"history\":[{\"created\":\"1970-01-01T00:00:00Z\",\"author\":\"Jib\",\"created_by\":\"jib-core:null\",\"comment\":\"\"},{\"created\":\"1970-01-01T00:00:00Z\",\"author\":\"Jib\",\"created_by\":\"jib-core:null\",\"comment\":\"\"},{\"created\":\"1970-01-01T00:00:00Z\",\"author\":\"Jib\",\"created_by\":\"jib-core:null\",\"comment\":\"\"}],"
-            + "\"rootfs\":{\"type\":\"layers\",\"diff_ids\":[\"sha256:18e4f44e6d1835bd968339b166057bd17ab7d4cbb56dc7262a5cafea7cf8d405\",\"sha256:13369c34f073f2b9c1fa6431e23d925f1a8eac65b1726c8cc8fcc2596c69b414\",\"sha256:4f92c507112d7880ca0f504ef8272b7fdee107263270125036a260a741565923\"]}}";
+            + "\"rootfs\":{\"type\":\"layers\",\"diff_ids\":[\"sha256:2fcc2157bf42c89195676ef6e973a96d7b018c9d30ba89db95e9e0722e1c8ef3\",\"sha256:21f521f3217067d277af37512a08c72281d90fdd02d7174db632c8c3a34403bd\",\"sha256:6beba018395265af5061864b7f4678e831eb2daebb1045487c641fc8b142e319\"]}}";
     String generatedConfig = extractFromTarFileAsString(imageTar, "config.json");
     assertThat(generatedConfig).isEqualTo(expectedConfig);
   }
diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/image/ReproducibleLayerBuilder.java b/jib-core/src/main/java/com/google/cloud/tools/jib/image/ReproducibleLayerBuilder.java
index c258eb2b5f..ea7ea5a943 100644
--- a/jib-core/src/main/java/com/google/cloud/tools/jib/image/ReproducibleLayerBuilder.java
+++ b/jib-core/src/main/java/com/google/cloud/tools/jib/image/ReproducibleLayerBuilder.java
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -76,11 +77,11 @@ private void add(TarArchiveEntry tarArchiveEntry) throws IOException {
       if (namePath.getParent() != namePath.getRoot()) {
         Path tarArchiveParentDir = Verify.verifyNotNull(namePath.getParent());
         TarArchiveEntry dir = new TarArchiveEntry(DIRECTORY_FILE, tarArchiveParentDir.toString());
-        dir.setModTime(FileEntriesLayer.DEFAULT_MODIFICATION_TIME.toEpochMilli());
         dir.setUserId(0);
         dir.setGroupId(0);
         dir.setUserName("");
         dir.setGroupName("");
+        clearTimeHeaders(dir, FileEntriesLayer.DEFAULT_MODIFICATION_TIME);
         add(dir);
       }
 
@@ -95,6 +96,20 @@ private List<TarArchiveEntry> getSortedEntries() {
     }
   }
 
+  private static void clearTimeHeaders(TarArchiveEntry entry, Instant modTime) {
+    entry.setModTime(modTime.toEpochMilli());
+
+    String headerTime = Long.toString(modTime.getEpochSecond());
+    final long nanos = modTime.getNano();
+    if (nanos > 0) {
+      headerTime += "." + nanos;
+    }
+    entry.addPaxHeader("mtime", headerTime);
+    entry.addPaxHeader("atime", headerTime);
+    entry.addPaxHeader("ctime", headerTime);
+    entry.addPaxHeader("LIBARCHIVE.creationtime", headerTime);
+  }
+
   private static void setUserAndGroup(TarArchiveEntry entry, FileEntry layerEntry) {
     entry.setUserId(0);
     entry.setGroupId(0);
@@ -156,8 +171,8 @@ public Blob build() throws IOException {
       // Sets the entry's permissions by masking out the permission bits from the entry's mode (the
       // lowest 9 bits) then using a bitwise OR to set them to the layerEntry's permissions.
       entry.setMode((entry.getMode() & ~0777) | layerEntry.getPermissions().getPermissionBits());
-      entry.setModTime(layerEntry.getModificationTime().toEpochMilli());
       setUserAndGroup(entry, layerEntry);
+      clearTimeHeaders(entry, layerEntry.getModificationTime());
 
       uniqueTarArchiveEntries.add(entry);
     }
diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/tar/TarExtractorTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/tar/TarExtractorTest.java
index 9f82420b39..2bff23dbdc 100644
--- a/jib-core/src/test/java/com/google/cloud/tools/jib/tar/TarExtractorTest.java
+++ b/jib-core/src/test/java/com/google/cloud/tools/jib/tar/TarExtractorTest.java
@@ -27,6 +27,7 @@
 import java.nio.file.Paths;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.Assert;
@@ -92,16 +93,31 @@ public void testExtract_modificationTimePreserved() throws URISyntaxException, I
 
     TarExtractor.extract(source, destination);
 
-    assertThat(Files.getLastModifiedTime(destination.resolve("file A")))
-        .isEqualTo(FileTime.from(Instant.parse("2019-08-01T16:13:09Z")));
-    assertThat(Files.getLastModifiedTime(destination.resolve("file B")))
-        .isEqualTo(FileTime.from(Instant.parse("2019-08-01T16:12:00Z")));
-    assertThat(Files.getLastModifiedTime(destination.resolve("folder")))
-        .isEqualTo(FileTime.from(Instant.parse("2019-08-01T16:12:33Z")));
-    assertThat(Files.getLastModifiedTime(destination.resolve("folder/nested folder")))
-        .isEqualTo(FileTime.from(Instant.parse("2019-08-01T16:13:30Z")));
-    assertThat(Files.getLastModifiedTime(destination.resolve("folder/nested folder/file C")))
-        .isEqualTo(FileTime.from(Instant.parse("2019-08-01T16:12:21Z")));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("file A"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2019-08-01T16:13:09Z"));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("file B"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2019-08-01T16:12:00Z"));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("folder"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2019-08-01T16:12:33Z"));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("folder/nested folder"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2019-08-01T16:13:30Z"));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("folder/nested folder/file C"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2019-08-01T16:12:21Z"));
   }
 
   @Test
@@ -113,14 +129,26 @@ public void testExtract_reproducibleTimestampsEnabled() throws URISyntaxExceptio
 
     TarExtractor.extract(source, destination, true);
 
-    assertThat(Files.getLastModifiedTime(destination.resolve("level-1")))
-        .isEqualTo(FileTime.fromMillis(1000L));
-    assertThat(Files.getLastModifiedTime(destination.resolve("level-1/level-2")))
-        .isEqualTo(FileTime.fromMillis(1000L));
-    assertThat(Files.getLastModifiedTime(destination.resolve("level-1/level-2/level-3")))
-        .isEqualTo(FileTime.fromMillis(1000L));
-    assertThat(Files.getLastModifiedTime(destination.resolve("level-1/level-2/level-3/file.txt")))
-        .isEqualTo(FileTime.from(Instant.parse("2021-01-29T21:10:02Z")));
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("level-1"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(FileTime.fromMillis(1000L).toInstant());
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("level-1/level-2"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(FileTime.fromMillis(1000L).toInstant());
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("level-1/level-2/level-3"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(FileTime.fromMillis(1000L).toInstant());
+    assertThat(
+            Files.getLastModifiedTime(destination.resolve("level-1/level-2/level-3/file.txt"))
+                .toInstant()
+                .truncatedTo(ChronoUnit.SECONDS))
+        .isEqualTo(Instant.parse("2021-01-29T21:10:02Z"));
   }
 
   @Test
diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md
index b2aef812d0..4f4e323ea9 100644
--- a/jib-gradle-plugin/CHANGELOG.md
+++ b/jib-gradle-plugin/CHANGELOG.md
@@ -7,7 +7,13 @@ All notable changes to this project will be documented in this file.
 - 
 
 ### Changed
--
+- deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+### Fixed
+- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+
+## 3.4.1
 
 ### Fixed
 - fix: support parsing manifest JSON containing `LayerSources:` from latest Docker. ([#4171](https://github.com/GoogleContainerTools/jib/pull/4171))
diff --git a/jib-gradle-plugin/README.md b/jib-gradle-plugin/README.md
index b0243e4081..72f92b3d9e 100644
--- a/jib-gradle-plugin/README.md
+++ b/jib-gradle-plugin/README.md
@@ -53,7 +53,7 @@ In your Gradle Java project, add the plugin to your `build.gradle`:
 
 ```groovy
 plugins {
-  id 'com.google.cloud.tools.jib' version '3.4.0'
+  id 'com.google.cloud.tools.jib' version '3.4.1'
 }
 ```
 
@@ -212,7 +212,7 @@ Field | Type | Default | Description
 
 Property | Type | Default | Description
 --- | --- | --- | ---
-`image` | `String` | `eclipse-temurin:{8,11,17}-jre` (or `jetty` for WAR) | The image reference for the base image. The source type can be specified using a [special type prefix](#setting-the-base-image).
+`image` | `String` | `eclipse-temurin:{8,11,17,21}-jre` (or `jetty` for WAR) | The image reference for the base image. The source type can be specified using a [special type prefix](#setting-the-base-image).
 `auth` | [`auth`](#auth-closure) | *None* | Specifies credentials directly (alternative to `credHelper`).
 `credHelper` | `String` | *None* | Specifies a credential helper that can authenticate pulling the base image. This parameter can either be configured as an absolute path to the credential helper executable or as a credential helper suffix (following `docker-credential-`).
 `platforms` | [`platforms`](#platforms-closure) | See [`platforms`](#platforms-closure) | Configures platforms of base images to select from a manifest list.
diff --git a/jib-gradle-plugin/gradle.properties b/jib-gradle-plugin/gradle.properties
index f866e3b569..54800605c2 100644
--- a/jib-gradle-plugin/gradle.properties
+++ b/jib-gradle-plugin/gradle.properties
@@ -1 +1 @@
-version = 3.4.1-SNAPSHOT
+version = 3.4.2-SNAPSHOT
diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md
index 53957ba9e8..a39c7f1414 100644
--- a/jib-maven-plugin/CHANGELOG.md
+++ b/jib-maven-plugin/CHANGELOG.md
@@ -7,7 +7,12 @@ All notable changes to this project will be documented in this file.
 -
 
 ### Changed
--
+- deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+### Fixed
+- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204))
+
+## 3.4.1
 
 ### Fixed
 - fix: support parsing manifest JSON containing `LayerSources:` from latest Docker. ([#4171](https://github.com/GoogleContainerTools/jib/pull/4171))
diff --git a/jib-maven-plugin/README.md b/jib-maven-plugin/README.md
index f5abef81c4..37d347355a 100644
--- a/jib-maven-plugin/README.md
+++ b/jib-maven-plugin/README.md
@@ -48,7 +48,7 @@ For information about the project, see the [Jib project README](../README.md).
 You can containerize your application easily with one command:
 
 ```shell
-mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.0:build -Dimage=<MY IMAGE>
+mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.1:build -Dimage=<MY IMAGE>
 ```
 
 This builds and pushes a container image for your application to a container registry. *If you encounter authentication issues, see [Authentication Methods](#authentication-methods).*
@@ -56,7 +56,7 @@ This builds and pushes a container image for your application to a container reg
 To build to a Docker daemon, use:
 
 ```shell
-mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.0:dockerBuild
+mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.1:dockerBuild
 ```
 
 If you would like to set up Jib as part of your Maven build, follow the guide below.
@@ -74,7 +74,7 @@ In your Maven Java project, add the plugin to your `pom.xml`:
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
         <configuration>
           <to>
             <image>myimage</image>
@@ -261,7 +261,7 @@ Field | Type | Default | Description
 
 Property | Type | Default | Description
 --- | --- | --- | ---
-`image` | string | `eclipse-temurin:{8,11,17}-jre` (or `jetty` for WAR) | The image reference for the base image. The source type can be specified using a [special type prefix](#setting-the-base-image).
+`image` | string | `eclipse-temurin:{8,11,17,21}-jre` (or `jetty` for WAR) | The image reference for the base image. The source type can be specified using a [special type prefix](#setting-the-base-image).
 `auth` | [`auth`](#auth-object) | *None* | Specifies credentials directly (alternative to `credHelper`).
 `credHelper` | string | *None* | Specifies a credential helper that can authenticate pulling the base image. This parameter can either be configured as an absolute path to the credential helper executable or as a credential helper suffix (following `docker-credential-`).
 `platforms` | list | See [`platform`](#platform-object) | Configures platforms of base images to select from a manifest list.
diff --git a/jib-maven-plugin/gradle.properties b/jib-maven-plugin/gradle.properties
index f866e3b569..54800605c2 100644
--- a/jib-maven-plugin/gradle.properties
+++ b/jib-maven-plugin/gradle.properties
@@ -1 +1 @@
-version = 3.4.1-SNAPSHOT
+version = 3.4.2-SNAPSHOT
diff --git a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java
index c1aafa3617..8ac4001db5 100644
--- a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java
+++ b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java
@@ -530,6 +530,9 @@ static JavaContainerBuilder getJavaContainerBuilderWithBaseImage(
     if (isKnownJava17Image(prefixRemoved) && javaVersion > 17) {
       throw new IncompatibleBaseImageJavaVersionException(17, javaVersion);
     }
+    if (isKnownJava21Image(prefixRemoved) && javaVersion > 21) {
+      throw new IncompatibleBaseImageJavaVersionException(21, javaVersion);
+    }
 
     ImageReference baseImageReference = ImageReference.parse(prefixRemoved);
     if (baseImageConfig.startsWith(Jib.DOCKER_DAEMON_IMAGE_PREFIX)) {
@@ -773,8 +776,10 @@ static String getDefaultBaseImage(ProjectProperties projectProperties)
       return "eclipse-temurin:11-jre";
     } else if (javaVersion <= 17) {
       return "eclipse-temurin:17-jre";
+    } else if (javaVersion <= 21) {
+      return "eclipse-temurin:21-jre";
     }
-    throw new IncompatibleBaseImageJavaVersionException(17, javaVersion);
+    throw new IncompatibleBaseImageJavaVersionException(21, javaVersion);
   }
 
   /**
@@ -1098,4 +1103,14 @@ private static boolean isKnownJava11Image(String imageReference) {
   private static boolean isKnownJava17Image(String imageReference) {
     return imageReference.startsWith("eclipse-temurin:17");
   }
+
+  /**
+   * Checks if the given image is a known Java 21 image. May return false negative.
+   *
+   * @param imageReference the image reference
+   * @return {@code true} if the image is a known Java 21 image
+   */
+  private static boolean isKnownJava21Image(String imageReference) {
+    return imageReference.startsWith("eclipse-temurin:21");
+  }
 }
diff --git a/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java b/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java
index cc8a5992fb..51404d1351 100644
--- a/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java
+++ b/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java
@@ -903,7 +903,8 @@ public void testGetDefaultBaseImage_warProject()
         "9, eclipse-temurin:11-jre",
         "11, eclipse-temurin:11-jre",
         "13, eclipse-temurin:17-jre",
-        "17, eclipse-temurin:17-jre"
+        "17, eclipse-temurin:17-jre",
+        "21, eclipse-temurin:21-jre"
       })
   public void testGetDefaultBaseImage_defaultJavaBaseImage(
       int javaVersion, String expectedBaseImage) throws IncompatibleBaseImageJavaVersionException {
@@ -913,16 +914,16 @@ public void testGetDefaultBaseImage_defaultJavaBaseImage(
   }
 
   @Test
-  public void testGetDefaultBaseImage_projectHigherThanJava17() {
-    when(projectProperties.getMajorJavaVersion()).thenReturn(20);
+  public void testGetDefaultBaseImage_projectHigherThanJava21() {
+    when(projectProperties.getMajorJavaVersion()).thenReturn(22);
 
     IncompatibleBaseImageJavaVersionException exception =
         assertThrows(
             IncompatibleBaseImageJavaVersionException.class,
             () -> PluginConfigurationProcessor.getDefaultBaseImage(projectProperties));
 
-    assertThat(exception.getBaseImageMajorJavaVersion()).isEqualTo(17);
-    assertThat(exception.getProjectMajorJavaVersion()).isEqualTo(20);
+    assertThat(exception.getBaseImageMajorJavaVersion()).isEqualTo(21);
+    assertThat(exception.getProjectMajorJavaVersion()).isEqualTo(22);
   }
 
   @Test
@@ -980,7 +981,9 @@ public void testGetJavaContainerBuilderWithBaseImage_registryWithPrefix()
         "eclipse-temurin:11, 11, 15",
         "eclipse-temurin:11-jre, 11, 15",
         "eclipse-temurin:17, 17, 19",
-        "eclipse-temurin:17-jre, 17, 19"
+        "eclipse-temurin:17-jre, 17, 19",
+        "eclipse-temurin:21, 21, 22",
+        "eclipse-temurin:21-jre, 21, 22"
       })
   public void testGetJavaContainerBuilderWithBaseImage_incompatibleJavaBaseImage(
       String baseImage, int baseImageJavaVersion, int appJavaVersion) {
@@ -1010,8 +1013,8 @@ public void testGetJavaContainerBuilderWithBaseImage_java12BaseImage()
   }
 
   @Test
-  public void testGetJavaContainerBuilderWithBaseImage_java19NoBaseImage() {
-    when(projectProperties.getMajorJavaVersion()).thenReturn(19);
+  public void testGetJavaContainerBuilderWithBaseImage_java22NoBaseImage() {
+    when(projectProperties.getMajorJavaVersion()).thenReturn(22);
     when(rawConfiguration.getFromImage()).thenReturn(Optional.empty());
     IncompatibleBaseImageJavaVersionException exception =
         assertThrows(
@@ -1019,8 +1022,8 @@ public void testGetJavaContainerBuilderWithBaseImage_java19NoBaseImage() {
             () ->
                 PluginConfigurationProcessor.getJavaContainerBuilderWithBaseImage(
                     rawConfiguration, projectProperties, inferredAuthProvider));
-    assertThat(exception.getBaseImageMajorJavaVersion()).isEqualTo(17);
-    assertThat(exception.getProjectMajorJavaVersion()).isEqualTo(19);
+    assertThat(exception.getBaseImageMajorJavaVersion()).isEqualTo(21);
+    assertThat(exception.getProjectMajorJavaVersion()).isEqualTo(22);
   }
 
   @Test