diff --git a/spring-shell-samples/spring-shell-sample-catalog/spring-shell-sample-catalog.gradle b/spring-shell-samples/spring-shell-sample-catalog/spring-shell-sample-catalog.gradle
index 176d1d9a..d872ddc8 100644
--- a/spring-shell-samples/spring-shell-sample-catalog/spring-shell-sample-catalog.gradle
+++ b/spring-shell-samples/spring-shell-sample-catalog/spring-shell-sample-catalog.gradle
@@ -20,7 +20,7 @@ springBoot {
 
 if (project.hasProperty('springShellSampleE2E') && springShellSampleE2E.toBoolean()) {
 	bootJar {
-		archiveName = "$baseName.$extension"
+		archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
 	}
 }
 
diff --git a/spring-shell-samples/spring-shell-sample-commands/spring-shell-sample-commands.gradle b/spring-shell-samples/spring-shell-sample-commands/spring-shell-sample-commands.gradle
index 8856c449..30fa3dd3 100644
--- a/spring-shell-samples/spring-shell-sample-commands/spring-shell-sample-commands.gradle
+++ b/spring-shell-samples/spring-shell-sample-commands/spring-shell-sample-commands.gradle
@@ -20,7 +20,7 @@ springBoot {
 
 if (project.hasProperty('springShellSampleE2E') && springShellSampleE2E.toBoolean()) {
 	bootJar {
-	   	archiveName = "$baseName.$extension"
+		archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
 	}
 }
 
diff --git a/spring-shell-samples/spring-shell-sample-e2e/spring-shell-sample-e2e.gradle b/spring-shell-samples/spring-shell-sample-e2e/spring-shell-sample-e2e.gradle
index 0501ef60..5bd9fabf 100644
--- a/spring-shell-samples/spring-shell-sample-e2e/spring-shell-sample-e2e.gradle
+++ b/spring-shell-samples/spring-shell-sample-e2e/spring-shell-sample-e2e.gradle
@@ -20,7 +20,7 @@ springBoot {
 
 if (project.hasProperty('springShellSampleE2E') && springShellSampleE2E.toBoolean()) {
 	bootJar {
-	   	archiveName = "$baseName.$extension"
+		archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}"
 	}
 }