diff --git a/ui/src/main/java/org/eclipse/starter/ui/Project.java b/ui/src/main/java/org/eclipse/starter/ui/Project.java
index 10a671d..08573ef 100644
--- a/ui/src/main/java/org/eclipse/starter/ui/Project.java
+++ b/ui/src/main/java/org/eclipse/starter/ui/Project.java
@@ -162,17 +162,17 @@ public void onJakartaVersionChange() {
 
 			profiles.get("core").setDisabled(true);
 
-			if ((jakartaVersion == 9) || (jakartaVersion == 9.1)) {
-				runtimes.get("wildfly").setDisabled(true);
-			} else {
+			if (jakartaVersion == 8) {
 				runtimes.get("wildfly").setDisabled(false);
+			} else {
+				runtimes.get("wildfly").setDisabled(true);
 			}
 
 			if (profile.equals("web") &&
 			        ((jakartaVersion == 8) || ((jakartaVersion == 9.1) && (javaVersion != 8)))) {
 				runtimes.get("tomee").setDisabled(false);
 			}
-			
+
 			if ((jakartaVersion != 8) && (javaVersion == 8)) {
 			    runtimes.get("payara").setDisabled(true);
 				runtimes.get("glassfish").setDisabled(true);
@@ -207,10 +207,10 @@ public void onProfileChange() {
 			jakartaVersions.get("9.1").setDisabled(false);
 		}
 
-		if ((jakartaVersion == 8) 
+		if ((jakartaVersion == 8)
 		    || runtime.equals("open-liberty") || runtime.equals("none")) {
 		    javaVersions.get("8").setDisabled(false);
-	    }		
+	    }
 
 		if ((jakartaVersion == 8) || ((jakartaVersion == 9.1) && (javaVersion != 8))) {
 			runtimes.get("tomee").setDisabled(false);
@@ -299,13 +299,13 @@ public void onRuntimeChange() {
 				"Validating form for Jakarta EE version: {0}, Jakarta EE profile: {1}, Java SE version: {2}, Docker: {3}, runtime: {4}",
 				new Object[] { jakartaVersion, profile, javaVersion, docker, runtime });
 		if (!profile.equals("core")) {
-			jakartaVersions.get("9").setDisabled(false);			
+			jakartaVersions.get("9").setDisabled(false);
 			jakartaVersions.get("9.1").setDisabled(false);
 		}
 
 		if (javaVersion != 8) {
 		    jakartaVersions.get("10").setDisabled(false);
-		}		
+		}
 
 		if (jakartaVersion == 10) {
 			profiles.get("core").setDisabled(false);
@@ -329,7 +329,7 @@ public void onRuntimeChange() {
 			dockerFlags.get("true").setDisabled(true);
 			profiles.get("core").setDisabled(true);
 
-			if (jakartaVersion != 8) {				
+			if (jakartaVersion != 8) {
 			    javaVersions.get("8").setDisabled(true);
 			}
 		} else if (runtime.equals("tomee")) {