diff --git a/pkgbuild/create-installer-mac.sh b/pkgbuild/create-installer-mac.sh
index 557209341..126d5893a 100755
--- a/pkgbuild/create-installer-mac.sh
+++ b/pkgbuild/create-installer-mac.sh
@@ -50,6 +50,10 @@ do tar -xf "$f";
     *openj9*)
       export JVM="openj9"
     ;;
+    *)
+      echo Cannot identify variant from filename "${f}" - only hotspot or openj9 are allowable
+      exit 1
+    ;;
   esac
 
   # Detect if JRE or JDK
diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd
index d9b667873..dfd450365 100644
--- a/wix/Build.OpenJDK_generic.cmd
+++ b/wix/Build.OpenJDK_generic.cmd
@@ -70,6 +70,10 @@ IF NOT "%ARCH%" == "x64" (
 	)
 )
 
+REM Update to handle the change of build variant until implications
+REM of setting this to Temurin can be evaluated
+IF "%JVM%" == "temurin" SET JVM=hotspot
+
 IF NOT "%JVM%" == "hotspot" (
 	IF NOT "%JVM%" == "openj9" (
 	    IF NOT "%JVM%" == "dragonwell" (