diff --git a/Jenkinsfile b/Jenkinsfile
index 0344ab734..a4820853f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,10 +60,10 @@ pipeline {
 						}
 					}
 				}
-				stage('Publish JDK 17 + Valkey 7.2 Docker Image') {
+				stage('Publish JDK 17 + Valkey 8.0 Docker Image') {
 					when {
 						anyOf {
-							changeset "ci/openjdk17-valkey-7.2/Dockerfile"
+							changeset "ci/openjdk17-valkey-8.0/Dockerfile"
 							changeset "Makefile"
 							changeset "ci/pipeline.properties"
 						}
@@ -73,7 +73,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-with-valkey-7.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.redis.7.version']} -f ci/openjdk17-redis-7.2/Dockerfile .")
+							def image = docker.build("springci/spring-data-with-valkey-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.valkey.8.version']} -f ci/openjdk17-valkey-8.0/Dockerfile .")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
@@ -197,7 +197,7 @@ pipeline {
 					}
 				}
 
-				stage("test: Valkey 7") {
+				stage("test: Valkey 8") {
 					agent {
 						label 'data'
 					}
@@ -209,7 +209,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image("springci/spring-data-with-valkey-7.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
+								docker.image("springci/spring-data-with-valkey-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
 									sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 								}
 							}
diff --git a/Makefile b/Makefile
index 304a2648b..d2051060c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION:=7.2.5
+VERSION?=7.2.5
 PROJECT?=redis
 GH_ORG?=redis
 SPRING_PROFILE?=ci
diff --git a/ci/openjdk17-valkey-7.2/Dockerfile b/ci/openjdk17-valkey-8.0/Dockerfile
similarity index 100%
rename from ci/openjdk17-valkey-7.2/Dockerfile
rename to ci/openjdk17-valkey-8.0/Dockerfile
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index cd2fcf7fb..7e44f69e0 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -16,6 +16,7 @@ docker.mongodb.8.0.version=8.0.0
 # Supported versions of Redis
 docker.redis.6.version=6.2.13
 docker.redis.7.version=7.2.4
+docker.valkey.8.version=8.0.2
 
 # Supported versions of Cassandra
 docker.cassandra.3.version=3.11.16