diff --git a/.woodpecker/.build-perls.yml b/.woodpecker/.build-perls.yml
index 58b3a50..891c983 100644
--- a/.woodpecker/.build-perls.yml
+++ b/.woodpecker/.build-perls.yml
@@ -20,17 +20,17 @@ matrix:
 # TODO upgrade things to latest minor versions and also include 5.38
   PERL_OPTIONS:
     - ""
-    - ",threaded"
-    - ",longdouble"
-    - ",quadmath"
-    - ",debugging"
-    - ",longdouble,threaded"
-    - ",quadmath,threaded"
-    - ",debugging,threaded"
-    - ",debugging,longdouble,threaded"
-    - ",debugging,quadmath,threaded"
-    - ",debugging,longdouble"
-    - ",debugging,quadmath"
+    - "-threaded"
+    - "-longdouble"
+    - "-quadmath"
+    - "-debugging"
+    - "-longdouble-threaded"
+    - "-quadmath-threaded"
+    - "-debugging-threaded"
+    - "-debugging-longdouble-threaded"
+    - "-debugging-quadmath-threaded"
+    - "-debugging-longdouble"
+    - "-debugging-quadmath"
 
 steps:
   fetch:
diff --git a/generate.pl b/generate.pl
index af4cca4..2cc451f 100755
--- a/generate.pl
+++ b/generate.pl
@@ -91,17 +91,17 @@ path("output/downloads")->mkdir();
 
 for my $build (@{$config->{builds}}) {
   $builds{$build} = $config->{options}{common};
-  $builds{"$build,threaded"} = "@{$config->{options}}{qw/threaded common/}";
-  $builds{"$build,longdouble"} = "@{$config->{options}}{qw/longdouble common/}";
-  $builds{"$build,quadmath"} = "@{$config->{options}}{qw/quadmath common/}";
-  $builds{"$build,debugging"} = "@{$config->{options}}{qw/debugging common/}";
-  $builds{"$build,longdouble,threaded"} = "@{$config->{options}}{qw/longdouble threaded common/}";
-  $builds{"$build,quadmath,threaded"} = "@{$config->{options}}{qw/quadmath threaded common/}";
-  $builds{"$build,debugging,threaded"} = "@{$config->{options}}{qw/debugging threaded common/}";
-  $builds{"$build,debugging,longdouble,threaded"} = "@{$config->{options}}{qw/debugging threaded longdouble common/}";
-  $builds{"$build,debugging,quadmath,threaded"} = "@{$config->{options}}{qw/debugging threaded quadmath common/}";
-  $builds{"$build,debugging,longdouble"} = "@{$config->{options}}{qw/debugging longdouble common/}";
-  $builds{"$build,debugging,quadmath"} = "@{$config->{options}}{qw/debugging quadmath common/}";
+  $builds{"$build-threaded"} = "@{$config->{options}}{qw/threaded common/}";
+  $builds{"$build-longdouble"} = "@{$config->{options}}{qw/longdouble common/}";
+  $builds{"$build-quadmath"} = "@{$config->{options}}{qw/quadmath common/}";
+  $builds{"$build-debugging"} = "@{$config->{options}}{qw/debugging common/}";
+  $builds{"$build-longdouble-threaded"} = "@{$config->{options}}{qw/longdouble threaded common/}";
+  $builds{"$build-quadmath-threaded"} = "@{$config->{options}}{qw/quadmath threaded common/}";
+  $builds{"$build-debugging-threaded"} = "@{$config->{options}}{qw/debugging threaded common/}";
+  $builds{"$build-debugging-longdouble-threaded"} = "@{$config->{options}}{qw/debugging threaded longdouble common/}";
+  $builds{"$build-debugging-quadmath-threaded"} = "@{$config->{options}}{qw/debugging threaded quadmath common/}";
+  $builds{"$build-debugging-longdouble"} = "@{$config->{options}}{qw/debugging longdouble common/}";
+  $builds{"$build-debugging-quadmath"} = "@{$config->{options}}{qw/debugging quadmath common/}";
 }
 
 for my $release (@{$config->{releases}}) {