diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 402e5b34d..c97f5deeb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,9 @@ name: Scene Builder PR Verify
 on:
   pull_request:
 
+env:
+  JAVA_VERSION: '21'
+
 jobs:
   verify:
     runs-on: ${{ matrix.os }}
@@ -17,7 +20,7 @@ jobs:
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 21
+          release: ${{ env.JAVA_VERSION }}
 
       - name: Run Tests (Linux)
         if: runner.os == 'Linux'
diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
index d3eaf986e..f0e03dfe1 100644
--- a/.github/workflows/bundles-kit.yml
+++ b/.github/workflows/bundles-kit.yml
@@ -7,7 +7,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
 
diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
index ff0bef026..edf745e2b 100644
--- a/.github/workflows/bundles-linux.yml
+++ b/.github/workflows/bundles-linux.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index eda21bd2a..7cf811a9f 100644
--- a/.github/workflows/bundles-mac.yml
+++ b/.github/workflows/bundles-mac.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index 83c8ae0c1..c3cfcedef 100644
--- a/.github/workflows/bundles-mac_aarch64.yml
+++ b/.github/workflows/bundles-mac_aarch64.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
index 1327e8313..74f2be2b0 100644
--- a/.github/workflows/bundles-windows.yml
+++ b/.github/workflows/bundles-windows.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
index 826f94854..7954621c8 100644
--- a/.github/workflows/early-access.yml
+++ b/.github/workflows/early-access.yml
@@ -5,7 +5,7 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '21'
+  JAVAFX_VERSION: '21.0.1'
   JAVA_VERSION: '21'
 
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96492be7a..e0e0f9230 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ on:
           - GA
 
 env:
-  JAVAFX_VERSION: '21'
+  JAVAFX_VERSION: '21.0.1'
   JAVA_VERSION: '21'
 
 jobs:
diff --git a/app/pom.xml b/app/pom.xml
index 3718807c9..a713b840c 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>21.0.0-SNAPSHOT</version>
+        <version>21.0.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/kit/pom.xml b/kit/pom.xml
index 2e0abee77..644d36cfb 100644
--- a/kit/pom.xml
+++ b/kit/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>21.0.0-SNAPSHOT</version>
+        <version>21.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 21fe2b3b8..193f7ca9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.gluonhq.scenebuilder</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>21.0.0-SNAPSHOT</version>
+    <version>21.0.1-SNAPSHOT</version>
     <name>Scene Builder</name>
     <description>Scene Builder is a visual, drag n drop, layout tool for designing JavaFX application user interfaces</description>
     <inceptionYear>2012</inceptionYear>
@@ -16,11 +16,11 @@
     </modules>
 
     <properties>
-        <java.version>21</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
-        <javafx.version>21</javafx.version>
+        <java.version>21.0.1</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
+        <javafx.version>21.0.1</javafx.version>
         <aether.version>1.1.0</aether.version>
         <charm.glisten.version>6.2.2</charm.glisten.version>
         <gluon.attach.version>4.0.19</gluon.attach.version>