diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf
index 693c05d7..4418628a 100644
--- a/src/Release/Setup Files/veracrypt.Inf	
+++ b/src/Release/Setup Files/veracrypt.Inf	
@@ -22,23 +22,29 @@ veracrypt.DriverFiles  = 12            ;%windir%\system32\drivers
 ;; Default install sections
 ;;
 
-[DefaultInstall]
+[DefaultInstall.NTx86]
 OptionDesc          = %ServiceDescription%
 CopyFiles           = veracrypt.DriverFiles
 AddReg              = veracrypt.AddReg
 
-[DefaultInstall.Services]
+[DefaultInstall.NTamd64]
+OptionDesc          = %ServiceDescription%
+CopyFiles           = veracrypt.DriverFiles
+AddReg              = veracrypt.AddReg
+
+[DefaultInstall.NTarm64]
+OptionDesc          = %ServiceDescription%
+CopyFiles           = veracrypt.DriverFiles
+AddReg              = veracrypt.AddReg
+
+[DefaultInstall.NTx86.Services]
 AddService          = veracrypt,,veracrypt.Service
 
-;;
-;; Default uninstall sections
-;;
+[DefaultInstall.NTamd64.Services]
+AddService          = veracrypt,,veracrypt.Service
 
-[DefaultUninstall]
-DelFiles   = veracrypt.DriverFiles
-
-[DefaultUninstall.Services]
-DelService = veracrypt,0x200      ;Ensure service is stopped before deleting
+[DefaultInstall.NTarm64.Services]
+AddService          = veracrypt,,veracrypt.Service
 
 ;
 ; Services Section