diff --git a/src/define.sh b/src/define.sh
index 155f2ad..6b89faf 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -2120,10 +2120,6 @@ prepareInstall() {
           echo "    OrgName=\"Windows for Docker\""
           echo "    ProductKey=$key"
           echo ""
-          echo "[LicenseFilePrintData]"
-          echo "    AutoMode=PerServer"
-          echo "    AutoUsers=5"
-          echo ""
           echo "[Identification]"
           echo "    JoinWorkgroup = WORKGROUP"
           echo ""
@@ -2142,6 +2138,17 @@ prepareInstall() {
           echo ""
   } | unix2dos > "$target/WINNT.SIF"
 
+  if [[ "$driver" == "2k3" ]]; then
+    {       echo "[Components]"
+            echo "    TerminalServer=On"
+            echo ""
+            echo "[LicenseFilePrintData]"
+            echo "    AutoMode=PerServer"
+            echo "    AutoUsers=5"
+            echo ""
+    } | unix2dos >> "$target/WINNT.SIF"
+  fi
+
   {       echo "Windows Registry Editor Version 5.00"
           echo ""
           echo "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Security]"
@@ -2159,18 +2166,12 @@ prepareInstall() {
           echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa]"
           echo "\"LimitBlankPasswordUse\"=dword:00000000"
           echo ""
-          echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows NT\CurrentVersion\srvWiz]"
-          echo "@=dword:00000000"
-          echo ""
           echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Applets\Tour]"
           echo "\"RunCount\"=dword:00000000"
           echo ""
           echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]"
           echo "\"HideFileExt\"=dword:00000000"
           echo ""
-          echo "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ServerOOBE\SecurityOOBE]"
-          echo "\"DontLaunchSecurityOOBE\"=dword:00000000"
-          echo ""
           echo "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]"
           echo "\"DefaultUserName\"=\"$username\""
           echo "\"DefaultDomainName\"=\"Dockur\""
@@ -2188,22 +2189,33 @@ prepareInstall() {
           echo "\"DefaultSettings.XResolution\"=dword:00000500"
           echo "\"DefaultSettings.YResolution\"=dword:000002D0"
           echo ""
-          echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Video\{BCF1BCA1-229E-4C3E-9CA2-86594BF5E2DE}\0000]"
-          echo "\"DefaultSettings.BitsPerPel\"=dword:00000020"
-          echo "\"DefaultSettings.XResolution\"=dword:00000500"
-          echo "\"DefaultSettings.YResolution\"=dword:000002D0"
-          echo ""
-          echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Control\VIDEO\{BCF1BCA1-229E-4C3E-9CA2-86594BF5E2DE}\0000]"
-          echo "\"DefaultSettings.BitsPerPel\"=dword:00000020"
-          echo "\"DefaultSettings.XResolution\"=dword:00000500"
-          echo "\"DefaultSettings.YResolution\"=dword:000002D0"
-          echo ""
           echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce]"
           echo "\"ScreenSaver\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"SCRNSAVE.EXE\\\" /t REG_SZ /d \\\"off\\\"\""
           echo "\"ScreenSaverOff\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"ScreenSaveActive\\\" /t REG_SZ /d \\\"0\\\"\""
           echo "$oem"
+          echo ""
   } | unix2dos > "$dir/\$OEM\$/install.reg"
 
+  if [[ "$driver" == "2k3" ]]; then
+    {       echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows NT\CurrentVersion\srvWiz]"
+            echo "@=dword:00000000"
+            echo ""
+            echo "[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\ServerOOBE\SecurityOOBE]"
+            echo "\"DontLaunchSecurityOOBE\"=dword:00000000"
+            echo ""
+            echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Video\{BCF1BCA1-229E-4C3E-9CA2-86594BF5E2DE}\0000]"
+            echo "\"DefaultSettings.BitsPerPel\"=dword:00000020"
+            echo "\"DefaultSettings.XResolution\"=dword:00000500"
+            echo "\"DefaultSettings.YResolution\"=dword:000002D0"
+            echo ""
+            echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Control\VIDEO\{BCF1BCA1-229E-4C3E-9CA2-86594BF5E2DE}\0000]"
+            echo "\"DefaultSettings.BitsPerPel\"=dword:00000020"
+            echo "\"DefaultSettings.XResolution\"=dword:00000500"
+            echo "\"DefaultSettings.YResolution\"=dword:000002D0"
+            echo ""
+    } | unix2dos >> "$dir/\$OEM\$/install.reg"
+  fi
+
   {       echo "Set WshShell = WScript.CreateObject(\"WScript.Shell\")"
           echo "Set WshNetwork = WScript.CreateObject(\"WScript.Network\")"
           echo "Set oMachine = GetObject(\"WinNT://\" & WshNetwork.ComputerName)"