diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc0e587..d8cf3fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
+<!-- TODO -->
 ## [1.3.0] - 2025-03-17
 
 ### Changed
@@ -27,4 +27,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Spring Boot 3.1.4 with Java 17
 - ButterCMS integration
 - Blog and landing page functionality
-- Thymeleaf templates for rendering pages
\ No newline at end of file
+- Thymeleaf templates for rendering pages
diff --git a/README.md b/README.md
index 63299c7..a3e92e0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Java version](https://img.shields.io/badge/Java-17-red) ![Version](https://img.shields.io/badge/Version-1.3.0-blue) ![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.2.3-green)
+![Java version](https://img.shields.io/badge/Java-21-red) ![Version](https://img.shields.io/badge/Version-1.3.0-blue) ![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.2.3-green)
 
 # Java Spring Boot +  ButterCMS Starter Project
 
@@ -18,25 +18,25 @@ to deploy your own copy of our starter project to the provider of your  choice.
 
 ### Prerequisites
 
-This project requires Java 17 and Maven. All other dependencies (Spring Boot, Java SDK for ButterCMS) are automatically managed by Maven.
+This project requires Java 21 and Maven. All other dependencies (Spring Boot, Java SDK for ButterCMS) are automatically managed by Maven.
 
-#### Installing Java 17 and Maven on Ubuntu
+#### Installing Java 21 and Maven on Ubuntu
 ```bash
-# Update package list and install OpenJDK 17
-sudo apt update && sudo apt install openjdk-17-jdk
+# Update package list and install OpenJDK 21
+sudo apt update && sudo apt install openjdk-21-jdk
 # Install Maven
 sudo apt install maven
 ```
 
-#### Installing Java 17 and Maven on macOS
+#### Installing Java 21 and Maven on macOS
 ```bash
 # Using Homebrew
-brew install --cask temurin@17
+brew install --cask temurin@21
 # Install Maven
 brew install maven
 ```
 
-#### Installing Java 17 and Maven on Windows
+#### Installing Java 21 and Maven on Windows
 Windows users can install Java from the official site. Make sure to set the `JAVA_HOME` environment variable after installation.
 
 To get started, clone and cd into the repo.
diff --git a/pom.xml b/pom.xml
index cb621a8..1d975c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <name>spring-starter-buttercms</name>
     <description>spring-starter-buttercms</description>
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <jackson.version>2.15.3</jackson.version>
     </properties>
     <dependencies>
@@ -85,4 +85,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/system.properties b/system.properties
index 51804f5..d5057d4 100644
--- a/system.properties
+++ b/system.properties
@@ -1,3 +1,3 @@
 # https://devcenter.heroku.com/articles/java-support#supported-java-versions
-java.runtime.version=17
-maven.version=3.9.5
\ No newline at end of file
+java.runtime.version=21
+maven.version=3.9.5