diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index a130540..90c023e 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -4,12 +4,12 @@ DefVar	$timer_enabled$
 Set	$timer_enabled$ = GetProductProperty("timer_enabled", "1")
 DefVar	$dotnet1.1$
 Set 	$dotnet1.1$ = GetProductProperty("dotnet1.1", "install")
-DefVar 	$dotnet2.0$
-Set 	$dotnet2.0$ = GetProductProperty("dotnet2.0", "install")
-DefVar	$dotnet3.0$
-Set 	$dotnet3.0$ = GetProductProperty("dotnet3.0", "install")
-DefVar	$dotnet3.5$
-Set 	$dotnet3.5$ = GetProductProperty("dotnet3.5", "install")
+;DefVar	$dotnet2.0$
+;Set 	$dotnet2.0$ = GetProductProperty("dotnet2.0", "install")
+;DefVar	$dotnet3.0$
+;Set 	$dotnet3.0$ = GetProductProperty("dotnet3.0", "install")
+;DefVar	$dotnet3.5$
+;Set 	$dotnet3.5$ = GetProductProperty("dotnet3.5", "install")
 DefVar	$dotnet4.0$
 Set 	$dotnet4.0$ = GetProductProperty("dotnet4.0", "none")
 DefVar	$dotnet4.5$
diff --git a/CLIENT_DATA/once3264.ins b/CLIENT_DATA/once3264.ins
index b88ef42..f49b482 100644
--- a/CLIENT_DATA/once3264.ins
+++ b/CLIENT_DATA/once3264.ins
@@ -4,7 +4,7 @@
 ; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-include_appent setup3264.inc
+include_append "setup3264.inc"
 
 requiredWinstVersion >= "4.11.2.6"
 
@@ -38,6 +38,13 @@ Set     $java_reinstall$ = GetProductProperty("java_reinstall", "1")
 DefVar  $MSVersion$
 Set     $MSVersion$ = GetMsVersionInfo
 
+DefVar  $dotnet2.0$
+Set     $dotnet2.0$ = GetProductProperty("dotnet2.0", "install")
+DefVar  $dotnet3.0$
+Set     $dotnet3.0$ = GetProductProperty("dotnet3.0", "install")
+DefVar  $dotnet3.5$
+Set     $dotnet3.5$ = GetProductProperty("dotnet3.5", "install")
+
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -93,7 +100,7 @@ else
 		comment "Copy files"
 		Files_install_32 /32Bit
 
-                if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
+                if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) 
                         comment "Install Netframework 2.0 - 3.5 for Windows 8"
                         if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
                                 Message "Install Netframework 2.0 - 3.5 for Windows 8"
@@ -123,7 +130,7 @@ else
 		comment "Copy files"
 		Files_install_64 /64Bit
 
-                if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
+                if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) 
                         comment "Install Netframework 2.0 - 3.5 for Windows 8"
                         if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
                                 Message "Install Netframework 2.0 - 3.5 for Windows 8"
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 30c5fdd..c133b6b 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -4,7 +4,7 @@
 ; credits: http://www.opsi.org/en/credits/
 
 [Actions]
-include_appent setup3264.inc
+include_append "setup3264.inc"
 
 requiredWinstVersion >= "4.11.2.6"
 
@@ -38,6 +38,13 @@ Set     $java_reinstall$ = GetProductProperty("java_reinstall", "1")
 DefVar  $MSVersion$
 Set     $MSVersion$ = GetMsVersionInfo
 
+DefVar  $dotnet2.0$
+Set     $dotnet2.0$ = GetProductProperty("dotnet2.0", "install")
+DefVar  $dotnet3.0$
+Set     $dotnet3.0$ = GetProductProperty("dotnet3.0", "install")
+DefVar  $dotnet3.5$
+Set     $dotnet3.5$ = GetProductProperty("dotnet3.5", "install")
+
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -93,7 +100,7 @@ else
 		comment "Copy files"
 		Files_install_32 /32Bit
 
-                if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
+                if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install"))
 			comment "Install Netframework 2.0 - 3.5 for Windows 8"
                         if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
                                 Message "Install Netframework 2.0 - 3.5 for Windows 8"
@@ -125,7 +132,7 @@ else
 		comment "Copy files"
 		Files_install_64 /64Bit
 
-                if ( $MSVersion$ = "6.2" ) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll"))
+                if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install"))
 			comment "Install Netframework 2.0 - 3.5 for Windows 8"
                         if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
                                 Message "Install Netframework 2.0 - 3.5 for Windows 8"