diff --git a/src/bin/build-keycloak-theme/build-keycloak-theme.ts b/src/bin/build-keycloak-theme/build-keycloak-theme.ts
index 55aea290..2d401957 100644
--- a/src/bin/build-keycloak-theme/build-keycloak-theme.ts
+++ b/src/bin/build-keycloak-theme/build-keycloak-theme.ts
@@ -4,6 +4,7 @@ import { join as pathJoin, relative as pathRelative, basename as pathBasename }
 import * as child_process from "child_process";
 import { generateDebugFiles, containerLaunchScriptBasename } from "./generateDebugFiles";
 import { URL } from "url";
+import type { KeycloakVersion } from "../KeycloakVersion";
 
 type ParsedPackageJson = {
     name: string;
@@ -11,6 +12,8 @@ type ParsedPackageJson = {
     homepage?: string;
 };
 
+const keycloakVersion: KeycloakVersion = "15.0.2";
+
 const reactProjectDirPath = process.cwd();
 
 const doUseExternalAssets = process.argv[2]?.toLowerCase() === "--external-assets";
@@ -67,7 +70,7 @@ export function main() {
         })(),
         extraPagesId,
         extraThemeProperties,
-        "keycloakVersion": "11.0.3"
+        keycloakVersion
     });
 
     const { jarFilePath } = generateJavaStackFiles({
@@ -85,7 +88,7 @@ export function main() {
     generateDebugFiles({
         keycloakThemeBuildingDirPath,
         themeName,
-        "keycloakVersion": "15.0.2"
+        keycloakVersion
     });
 
     console.log([
diff --git a/src/bin/install-builtin-keycloak-themes.ts b/src/bin/install-builtin-keycloak-themes.ts
index ac3caa82..22026116 100644
--- a/src/bin/install-builtin-keycloak-themes.ts
+++ b/src/bin/install-builtin-keycloak-themes.ts
@@ -3,7 +3,7 @@
 import { keycloakThemeBuildingDirPath } from "./build-keycloak-theme";
 import { join as pathJoin } from "path";
 import { downloadAndUnzip } from "./tools/downloadAndUnzip"
-import type { KeycloakVersion } from "./KeycloakVersion";
+import type { KeycloakVersion } from "../bin/KeycloakVersion";
 
 export function downloadBuiltinKeycloakTheme(
     params: {
@@ -29,7 +29,17 @@ export function downloadBuiltinKeycloakTheme(
 if (require.main === module) {
 
     downloadBuiltinKeycloakTheme({
-        "keycloakVersion": "11.0.3",
+        "keycloakVersion": (() => {
+
+            const keycloakVersion = process.argv[2] as (KeycloakVersion | undefined);
+
+            if (keycloakVersion === undefined) {
+                return "15.0.2";
+            }
+
+            return keycloakVersion;
+
+        })(),
         "destDirPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme")
     });