diff --git a/DeployTools/Deploy-FirstBoot.ps1 b/DeployTools/Deploy-FirstBoot.ps1
index 7f3579e..97627de 100644
--- a/DeployTools/Deploy-FirstBoot.ps1
+++ b/DeployTools/Deploy-FirstBoot.ps1
@@ -16,16 +16,13 @@ if (-Not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent
  }
 }
 
-#Disable Windows updates service
-Set-Service -Name "wuauserv" -Status Stopped -StartupType Disabled
-
 Write-Output "Checking activation status..."
 $ta = Get-CimInstance -ClassName SoftwareLicensingProduct -Filter "PartialProductKey IS NOT NULL" | Where-Object -Property Name -Like "Windows*" 
 if ($ta.LicenseStatus -eq 1) {Write-Output "Activation [OK]"} else {Write-Output "Activation [Error, Opening settings]";Start-Process "ms-settings:activation"; pause }
 
 Write-Output "Getting System name"
 $sysid = Read-Host -Prompt 'Please enter asset ID:' 
-Rename-Computer -NewName $sysid
+Rename-Computer -NewName "PC$sysid"
 Write-Output "System name [OK]"
 
 #Chocolaty software updates
@@ -38,9 +35,6 @@ if ( $confirmSupdates -eq 'y'){
 
 $confirmWupdates = Read-Host "Run Windows updates? (y/n)"
 if ( $confirmWupdates -eq 'y'){
-    #Enable Windows updates service
-    Set-Service -Name "wuauserv" -Status Stopped -StartupType Manual
-
     Write-Output "Checking Windows updates"
     Import-Module PSWindowsUpdate
     Get-WUInstall -MicrosoftUpdate -AcceptAll -IgnoreReboot -IgnoreRebootRequired -Install