diff --git a/assets/win11x64.xml b/assets/win11x64.xml
index 05d8118..d66b3cb 100644
--- a/assets/win11x64.xml
+++ b/assets/win11x64.xml
@@ -487,6 +487,11 @@
           <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
           <Description>Disable unsupported hardware notifications</Description>
         </SynchronousCommand>
+        <SynchronousCommand wcm:action="add">
+          <Order>201</Order>
+          <CommandLine>cmd.exe /c for %v in (A B D E F G H I J K L M N O P Q R S T U V W X Y Z) do if exist "%v:\FirstLogonCommands\install.bat" "%v:\FirstLogonCommands\install.bat"</CommandLine>
+          <Description>Execute FirstLogonCommands\install.bat</Description>
+        </SynchronousCommand>
       </FirstLogonCommands>
     </component>
   </settings>
diff --git a/src/install.sh b/src/install.sh
index 7ecbb86..56d7d17 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -1191,6 +1191,15 @@ bootWindows() {
   return 0
 }
 
+prepareCloudInit() {
+  local dir="$1"
+
+  if [ -f "$STORAGE/shared/FirstLogonCommands/install.bat" ]; then
+    # install.bat may depends files in the FirstLogonCommands
+    cp -r "$STORAGE/shared/FirstLogonCommands" "$dir/FirstLogonCommands"
+  fi
+}
+
 ######################################
 
 if ! startInstall; then
@@ -1231,6 +1240,10 @@ if ! rm -f "$ISO" 2> /dev/null; then
   rm -f  "$ISO"
 fi
 
+if ! prepareCloudInit "$DIR"; then
+  exit 60
+fi
+
 if ! buildImage "$DIR"; then
   exit 65
 fi