diff --git a/build.gradle b/build.gradle
index 9acbab61c32204d95a73bb05885db8bd2b04fae1..a7dcecdb226a99b2dbf6673e7e38ea9936d080a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 defaultTasks 'generate'
 
-def dockerVersions = ['8', '9']
-def dockerVariants = ['mysql-tomcat']
+def variants = ['mysql-tomcat']
 
 def tokens = [
     '8' : [
@@ -44,8 +43,8 @@ def tokens = [
 task generate() {
     doLast {
         // Copy the template for all versions and variants
-        dockerVersions.each() { version ->
-            dockerVariants.each() { variant ->
+        tokens.keySet().each() { version ->
+            variants.each() { variant ->
                 copy {
                     from 'template'
                     into "${version}/${variant}"