diff --git a/Winget-AutoUpdate-Install.ps1 b/Winget-AutoUpdate-Install.ps1
index 98c0163..7922ca4 100644
--- a/Winget-AutoUpdate-Install.ps1
+++ b/Winget-AutoUpdate-Install.ps1
@@ -246,7 +246,7 @@ function Install-WinGet {
             }
             Remove-Item -Path $VCLibsFile -Force
         }
-        
+
         #Download WinGet MSIXBundle
         Write-Host "-> Downloading WinGet MSIXBundle for App Installer..."
         $WinGetURL = "https://github.com/microsoft/winget-cli/releases/download/v$AvailableWinGetVersion/Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle"
@@ -393,6 +393,13 @@ function Install-WingetAutoUpdate {
         $task = New-ScheduledTask -Action $taskAction -Principal $taskUserPrincipal -Settings $taskSettings
         Register-ScheduledTask -TaskName 'Winget-AutoUpdate-Notify' -TaskPath 'WAU' -InputObject $task -Force | Out-Null
 
+        $taskAction = New-ScheduledTaskAction -Execute "powershell.exe" -Argument "-NoProfile -ExecutionPolicy Bypass -File `"$($WingetUpdatePath)\WAU-Policies.ps1`""
+        $tasktrigger = New-ScheduledTaskTrigger -Daily -At 6am
+        $taskUserPrincipal = New-ScheduledTaskPrincipal -UserId S-1-5-18 -RunLevel Highest
+        $taskSettings = New-ScheduledTaskSettingsSet -Compatibility Win8 -StartWhenAvailable -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit 00:05:00
+        $task = New-ScheduledTask -Action $taskAction -Principal $taskUserPrincipal -Settings $taskSettings -Trigger $taskTrigger
+        Register-ScheduledTask -TaskName 'Winget-AutoUpdate-Policies' -TaskPath 'WAU' -InputObject $task -Force | Out-Null
+
         #Set task readable/runnable for all users
         $scheduler = New-Object -ComObject "Schedule.Service"
         $scheduler.Connect()
@@ -425,6 +432,7 @@ function Install-WingetAutoUpdate {
         New-ItemProperty $regPath -Name WAU_MaxLogFiles -Value $MaxLogFiles -PropertyType DWord -Force | Out-Null
         New-ItemProperty $regPath -Name WAU_MaxLogSize -Value $MaxLogSize -PropertyType DWord -Force | Out-Null
         New-ItemProperty $regPath -Name WAU_UpdatesAtTime -Value $UpdatesAtTime -Force | Out-Null
+        New-ItemProperty $regPath -Name WAU_UpdatesInterval -Value $UpdatesInterval -Force | Out-Null
         if ($UpdatesAtLogon) {
             New-ItemProperty $regPath -Name WAU_UpdatesAtLogon -Value 1 -PropertyType DWord -Force | Out-Null
         }
diff --git a/Winget-AutoUpdate/WAU-Policies.ps1 b/Winget-AutoUpdate/WAU-Policies.ps1
new file mode 100644
index 0000000..3632b0b
--- /dev/null
+++ b/Winget-AutoUpdate/WAU-Policies.ps1
@@ -0,0 +1,65 @@
+<#
+.SYNOPSIS
+Handle GPO/Polices
+
+.DESCRIPTION
+Daily update settings from policies
+#>
+
+#Import functions
+. "$PSScriptRoot\functions\Get-WAUConfig.ps1"
+. "$PSScriptRoot\functions\Add-Shortcut.ps1"
+
+#Get WAU settings
+$WAUConfig = Get-WAUConfig
+
+#Check if GPO already applied at least once to this machine (ManagementTag)
+if ($WAUConfig.WAU_ManagementTag -eq 1) {
+
+    #Update 'Winget-AutoUpdate' scheduled task settings
+    $taskTriggers = @()
+    if ($WAUConfig.WAU_UpdatesAtLogon -eq 1) {
+        $tasktriggers += New-ScheduledTaskTrigger -AtLogOn
+    }
+    if ($WAUConfig.WAU_UpdatesInterval -eq "Daily") {
+        $tasktriggers += New-ScheduledTaskTrigger -Daily -At $UpdatesAtTime
+    }
+    elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiDaily") {
+        $tasktriggers += New-ScheduledTaskTrigger -Daily -At $UpdatesAtTime -DaysInterval 2
+    }
+    elseif ($WAUConfig.WAU_UpdatesInterval -eq "Weekly") {
+        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $UpdatesAtTime -DaysOfWeek 2
+    }
+    elseif ($WAUConfig.WAU_UpdatesInterval -eq "BiWeekly") {
+        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 2
+    }
+    elseif ($WAUConfig.WAU_UpdatesInterval -eq "Monthly") {
+        $tasktriggers += New-ScheduledTaskTrigger -Weekly -At $UpdatesAtTime -DaysOfWeek 2 -WeeksInterval 4
+    }
+    if ($taskTriggers) {
+        Get-ScheduledTask -TaskName 'Winget-AutoUpdate' -ErrorAction SilentlyContinue | Set-ScheduledTask -Trigger $taskTriggers
+    }
+
+    #Update Desktop shortcut
+    $DesktopShortcut = "${env:Public}\Desktop\WAU - Check for updated Apps.lnk"
+    if (($WAUConfig.WAU_DesktopShortcut -eq 1) -and !(Test-Path $DesktopShortcut)) {
+        Add-Shortcut "wscript.exe" $DesktopShortcut "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`"`"" "${env:SystemRoot}\System32\shell32.dll,-16739" "Manual start of Winget-AutoUpdate (WAU)..."
+    }
+    elseif ($WAUConfig.WAU_DesktopShortcut -ne 1) {
+        Remove-Item -Path $DesktopShortcut -Force | Out-Null
+    }
+
+    #Update Start Menu shortcuts
+    $StartMenuShortcut = "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)"
+    if (($WAUConfig.WAU_StartMenuShortcut -eq 1) -and !(Test-Path $StartMenuShortcut)) {
+        New-Item -ItemType Directory -Force -Path $StartMenuShortcut | Out-Null
+        Add-Shortcut "wscript.exe" "$StartMenuShortcut\WAU - Check for updated Apps.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`"`"" "${env:SystemRoot}\System32\shell32.dll,-16739" "Manual start of Winget-AutoUpdate (WAU)..."
+        Add-Shortcut "wscript.exe" "$StartMenuShortcut\WAU - Open logs.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`" -Logs`"" "${env:SystemRoot}\System32\shell32.dll,-16763" "Open existing WAU logs..."
+        Add-Shortcut "wscript.exe" "$StartMenuShortcut\WAU - Web Help.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`" -Help`"" "${env:SystemRoot}\System32\shell32.dll,-24" "Help for WAU..."
+    }
+    elseif ($WAUConfig.WAU_StartMenuShortcut -ne 1) {
+        Remove-Item -Path $StartMenuShortcut -Recurse -Force | Out-Null
+    }
+}
+
+Exit 0
\ No newline at end of file
diff --git a/Winget-AutoUpdate/Winget-Upgrade.ps1 b/Winget-AutoUpdate/Winget-Upgrade.ps1
index d078670..27bbbfe 100644
--- a/Winget-AutoUpdate/Winget-Upgrade.ps1
+++ b/Winget-AutoUpdate/Winget-Upgrade.ps1
@@ -14,25 +14,13 @@ $Script:IsSystem = [System.Security.Principal.WindowsIdentity]::GetCurrent().IsS
 #Run log initialisation function
 Start-Init
 
-#Get WAU Configurations
-$Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
+#Get settings and Domain/Local Policies (GPO) if activated.
+$WAUConfig = Get-WAUConfig
 
 #Log running context and more...
 if ($IsSystem) {
     Write-ToLog "Running in System context"
 
-    #Get and set Domain/Local Policies (GPO)
-    $ActivateGPOManagement, $ChangedSettings = Get-Policies
-    if ($ActivateGPOManagement) {
-        Write-ToLog "Activated WAU GPO Management detected, comparing..."
-        if ($null -ne $ChangedSettings -and $ChangedSettings -ne 0) {
-            Write-ToLog "Changed settings detected and applied" "Yellow"
-        }
-        else {
-            Write-ToLog "No Changed settings detected" "Yellow"
-        }
-    }
-
     # Maximum number of log files to keep. Default is 3. Setting MaxLogFiles to 0 will keep all log files.
     $MaxLogFiles = $WAUConfig.WAU_MaxLogFiles
     if ($null -eq $MaxLogFiles) {
diff --git a/Winget-AutoUpdate/functions/Get-Policies.ps1 b/Winget-AutoUpdate/functions/Get-Policies.ps1
deleted file mode 100644
index 0200341..0000000
--- a/Winget-AutoUpdate/functions/Get-Policies.ps1
+++ /dev/null
@@ -1,364 +0,0 @@
-#Function to get the Domain/Local Policies (GPO)
-
-Function Get-Policies {
-    #Get WAU Policies and set the Configurations Registry Accordingly
-    $WAUPolicies = Get-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate" -ErrorAction SilentlyContinue
-    if ($WAUPolicies) {
-        if ($($WAUPolicies.WAU_ActivateGPOManagement -eq 1)) {
-            $ChangedSettings = 0
-            $regPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-            if ($null -ne $($WAUPolicies.WAU_BypassListForUsers) -and ($($WAUPolicies.WAU_BypassListForUsers) -ne $($WAUConfig.WAU_BypassListForUsers))) {
-                New-ItemProperty $regPath -Name WAU_BypassListForUsers -Value $($WAUPolicies.WAU_BypassListForUsers) -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_BypassListForUsers) -and ($($WAUConfig.WAU_BypassListForUsers) -or $($WAUConfig.WAU_BypassListForUsers) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_BypassListForUsers -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_DisableAutoUpdate) -and ($($WAUPolicies.WAU_DisableAutoUpdate) -ne $($WAUConfig.WAU_DisableAutoUpdate))) {
-                New-ItemProperty $regPath -Name WAU_DisableAutoUpdate -Value $($WAUPolicies.WAU_DisableAutoUpdate) -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_DisableAutoUpdate) -and ($($WAUConfig.WAU_DisableAutoUpdate) -or $($WAUConfig.WAU_DisableAutoUpdate) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_DisableAutoUpdate -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_DoNotRunOnMetered) -and ($($WAUPolicies.WAU_DoNotRunOnMetered) -ne $($WAUConfig.WAU_DoNotRunOnMetered))) {
-                New-ItemProperty $regPath -Name WAU_DoNotRunOnMetered -Value $($WAUPolicies.WAU_DoNotRunOnMetered) -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_DoNotRunOnMetered) -and !$($WAUConfig.WAU_DoNotRunOnMetered)) {
-                New-ItemProperty $regPath -Name WAU_DoNotRunOnMetered -Value 1 -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UpdatePrerelease) -and ($($WAUPolicies.WAU_UpdatePrerelease) -ne $($WAUConfig.WAU_UpdatePrerelease))) {
-                New-ItemProperty $regPath -Name WAU_UpdatePrerelease -Value $($WAUPolicies.WAU_UpdatePrerelease) -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UpdatePrerelease) -and $($WAUConfig.WAU_UpdatePrerelease)) {
-                New-ItemProperty $regPath -Name WAU_UpdatePrerelease -Value 0 -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UseWhiteList) -and ($($WAUPolicies.WAU_UseWhiteList) -ne $($WAUConfig.WAU_UseWhiteList))) {
-                New-ItemProperty $regPath -Name WAU_UseWhiteList -Value $($WAUPolicies.WAU_UseWhiteList) -PropertyType DWord -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UseWhiteList) -and ($($WAUConfig.WAU_UseWhiteList) -or $($WAUConfig.WAU_UseWhiteList) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_UseWhiteList -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_ListPath) -and ($($WAUPolicies.WAU_ListPath) -ne $($WAUConfig.WAU_ListPath))) {
-                New-ItemProperty $regPath -Name WAU_ListPath -Value $($WAUPolicies.WAU_ListPath.TrimEnd(" ", "\", "/")) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_ListPath) -and $($WAUConfig.WAU_ListPath)) {
-                Remove-ItemProperty $regPath -Name WAU_ListPath -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_ModsPath) -and ($($WAUPolicies.WAU_ModsPath) -ne $($WAUConfig.WAU_ModsPath))) {
-                New-ItemProperty $regPath -Name WAU_ModsPath -Value $($WAUPolicies.WAU_ModsPath.TrimEnd(" ", "\", "/")) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_ModsPath) -and $($WAUConfig.WAU_ModsPath)) {
-                Remove-ItemProperty $regPath -Name WAU_ModsPath -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-            if ($null -ne $($WAUPolicies.WAU_AzureBlobSASURL) -and ($($WAUPolicies.WAU_AzureBlobSASURL) -ne $($WAUConfig.WAU_AzureBlobSASURL))) {
-                New-ItemProperty $regPath -Name WAU_AzureBlobSASURL -Value $($WAUPolicies.WAU_AzureBlobSASURL.TrimEnd(" ", "\", "/")) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_AzureBlobSASURL) -and $($WAUConfig.WAU_AzureBlobSASURL)) {
-                Remove-ItemProperty $regPath -Name WAU_AzureBlobSASURL -Force -ErrorAction SilentlyContinue | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_NotificationLevel) -and ($($WAUPolicies.WAU_NotificationLevel) -ne $($WAUConfig.WAU_NotificationLevel))) {
-                New-ItemProperty $regPath -Name WAU_NotificationLevel -Value $($WAUPolicies.WAU_NotificationLevel) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_NotificationLevel) -and $($WAUConfig.WAU_NotificationLevel) -ne "Full") {
-                New-ItemProperty $regPath -Name WAU_NotificationLevel -Value "Full" -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UpdatesAtTime) -and ($($WAUPolicies.WAU_UpdatesAtTime) -ne $($WAUConfig.WAU_UpdatesAtTime))) {
-                New-ItemProperty $regPath -Name WAU_UpdatesAtTime -Value $($WAUPolicies.WAU_UpdatesAtTime) -Force | Out-Null
-                $Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                    if (($definition.Triggers.Item($triggerId).Type -eq "2") -or ($definition.Triggers.Item($triggerId).Type -eq "3")) {
-                        $PreStartBoundary = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(0, 11)
-                        $PostStartBoundary = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(19, 6)
-                        $Boundary = $PreStartBoundary + $($WAUPolicies.WAU_UpdatesAtTime) + $PostStartBoundary
-                        $definition.Triggers.Item($triggerId).StartBoundary = $Boundary
-                        break
-                        $triggerId -= 1
-                    }
-                }
-                $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UpdatesAtTime) -and $($WAUConfig.WAU_UpdatesAtTime) -ne "06:00:00") {
-                New-ItemProperty $regPath -Name WAU_UpdatesAtTime -Value "06:00:00" -Force | Out-Null
-                $Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                    if (($definition.Triggers.Item($triggerId).Type -eq "2") -or ($definition.Triggers.Item($triggerId).Type -eq "3")) {
-                        $PreStartBoundary = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(0, 11)
-                        $PostStartBoundary = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(19, 6)
-                        $Boundary = $PreStartBoundary + "06:00:00" + $PostStartBoundary
-                        $definition.Triggers.Item($triggerId).StartBoundary = $Boundary
-                        break
-                        $triggerId -= 1
-                    }
-                }
-                $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UpdatesInterval) -and ($($WAUPolicies.WAU_UpdatesInterval) -ne $($WAUConfig.WAU_UpdatesInterval))) {
-                New-ItemProperty $regPath -Name WAU_UpdatesInterval -Value $($WAUPolicies.WAU_UpdatesInterval) -Force | Out-Null
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                    if (($definition.Triggers.Item($triggerId).Type -eq "2") -or ($definition.Triggers.Item($triggerId).Type -eq "3")) {
-                        $UpdatesAtTime = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(11, 8)
-                        $definition.Triggers.Remove($triggerId)
-                        $triggerId -= 1
-                    }
-                }
-                $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-
-                if (!$($WAUConfig.WAU_UpdatesAtTime)) {
-                    New-ItemProperty $regPath -Name WAU_UpdatesAtTime -Value $UpdatesAtTime -Force | Out-Null
-                    $Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-                }
-
-                if ($($WAUPolicies.WAU_UpdatesInterval) -ne "Never") {
-                    #Count Triggers (correctly)
-                    $service = New-Object -ComObject Schedule.Service
-                    $service.Connect($env:COMPUTERNAME)
-                    $folder = $service.GetFolder('\')
-                    $task = $folder.GetTask("Winget-AutoUpdate")
-                    $definition = $task.Definition
-                    $definition.Triggers.Count | Out-Null
-                    switch ($($WAUPolicies.WAU_UpdatesInterval)) {
-                        "Daily" { $tasktrigger = New-ScheduledTaskTrigger -Daily -At $($WAUConfig.WAU_UpdatesAtTime); break }
-                        "BiDaily" { $tasktrigger = New-ScheduledTaskTrigger -Daily -At $($WAUConfig.WAU_UpdatesAtTime) -DaysInterval 2; break }
-                        "Weekly" { $tasktrigger = New-ScheduledTaskTrigger -Weekly -At $($WAUConfig.WAU_UpdatesAtTime) -DaysOfWeek 2; break }
-                        "BiWeekly" { $tasktrigger = New-ScheduledTaskTrigger -Weekly -At $($WAUConfig.WAU_UpdatesAtTime) -DaysOfWeek 2 -WeeksInterval 2; break }
-                        "Monthly" { $tasktrigger = New-ScheduledTaskTrigger -Weekly -At $($WAUConfig.WAU_UpdatesAtTime) -DaysOfWeek 2 -WeeksInterval 4; break }
-                    }
-                    if ($definition.Triggers.Count -gt 0) {
-                        $triggers = @()
-                        $triggers += (Get-ScheduledTask "Winget-AutoUpdate").Triggers
-                        $triggers += $tasktrigger
-                        Set-ScheduledTask -TaskName "Winget-AutoUpdate" -Trigger $triggers
-                    }
-                    else {
-                        Set-ScheduledTask -TaskName "Winget-AutoUpdate" -Trigger $tasktrigger
-                    }
-                }
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UpdatesInterval) -and $($WAUConfig.WAU_UpdatesInterval) -ne "Daily") {
-                New-ItemProperty $regPath -Name WAU_UpdatesInterval -Value "Daily" -Force | Out-Null
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                    if (($definition.Triggers.Item($triggerId).Type -eq "2") -or ($definition.Triggers.Item($triggerId).Type -eq "3")) {
-                        $UpdatesAtTime = ($definition.Triggers.Item($triggerId).StartBoundary).Substring(11, 8)
-                        $definition.Triggers.Remove($triggerId)
-                        $triggerId -= 1
-                    }
-                }
-                $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-
-                if (!$($WAUConfig.WAU_UpdatesAtTime)) {
-                    New-ItemProperty $regPath -Name WAU_UpdatesAtTime -Value $UpdatesAtTime -Force | Out-Null
-                    $Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-                }
-
-                $tasktrigger = New-ScheduledTaskTrigger -Daily -At $($WAUConfig.WAU_UpdatesAtTime)
-
-                #Count Triggers (correctly)
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                $definition.Triggers.Count | Out-Null
-                if ($definition.Triggers.Count -gt 0) {
-                    $triggers = @()
-                    $triggers += (Get-ScheduledTask "Winget-AutoUpdate").Triggers
-                    $triggers += $tasktrigger
-                    Set-ScheduledTask -TaskName "Winget-AutoUpdate" -Trigger $triggers
-                }
-                else {
-                    Set-ScheduledTask -TaskName "Winget-AutoUpdate" -Trigger $tasktrigger
-                }
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UpdatesAtLogon) -and ($($WAUPolicies.WAU_UpdatesAtLogon) -ne $($WAUConfig.WAU_UpdatesAtLogon))) {
-                if ($WAUPolicies.WAU_UpdatesAtLogon -eq 1) {
-                    New-ItemProperty $regPath -Name WAU_UpdatesAtLogon -Value $($WAUPolicies.WAU_UpdatesAtLogon) -PropertyType DWord -Force | Out-Null
-                    $triggers = @()
-                    $triggers += (Get-ScheduledTask "Winget-AutoUpdate").Triggers
-                    #Count Triggers (correctly)
-                    $service = New-Object -ComObject Schedule.Service
-                    $service.Connect($env:COMPUTERNAME)
-                    $folder = $service.GetFolder('\')
-                    $task = $folder.GetTask("Winget-AutoUpdate")
-                    $definition = $task.Definition
-                    $triggerLogon = $false
-                    foreach ($trigger in $definition.Triggers) {
-                        if ($trigger.Type -eq "9") {
-                            $triggerLogon = $true
-                            break
-                        }
-                    }
-                    if (!$triggerLogon) {
-                        $triggers += New-ScheduledTaskTrigger -AtLogon
-                        Set-ScheduledTask -TaskName "Winget-AutoUpdate" -Trigger $triggers
-                    }
-                }
-                else {
-                    New-ItemProperty $regPath -Name WAU_UpdatesAtLogon -Value $($WAUPolicies.WAU_UpdatesAtLogon) -PropertyType DWord -Force | Out-Null
-                    $service = New-Object -ComObject Schedule.Service
-                    $service.Connect($env:COMPUTERNAME)
-                    $folder = $service.GetFolder('\')
-                    $task = $folder.GetTask("Winget-AutoUpdate")
-                    $definition = $task.Definition
-                    $definition.Triggers.Count | Out-Null
-                    for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                        if ($definition.Triggers.Item($triggerId).Type -eq "9") {
-                            $definition.Triggers.Remove($triggerId)
-                            $triggerId -= 1
-                        }
-                    }
-                    $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-                }
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UpdatesAtLogon) -and ($($WAUConfig.WAU_UpdatesAtLogon) -or $($WAUConfig.WAU_UpdatesAtLogon) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_UpdatesAtLogon -Force -ErrorAction SilentlyContinue | Out-Null
-                $service = New-Object -ComObject Schedule.Service
-                $service.Connect($env:COMPUTERNAME)
-                $folder = $service.GetFolder('\')
-                $task = $folder.GetTask("Winget-AutoUpdate")
-                $definition = $task.Definition
-                for ($triggerId = 1; $triggerId -le $definition.Triggers.Count; $triggerId++) {
-                    if ($definition.Triggers.Item($triggerId).Type -eq "9") {
-                        $definition.Triggers.Remove($triggerId)
-                        $triggerId -= 1
-                    }
-                }
-                $folder.RegisterTaskDefinition($task.Name, $definition, 4, $null, $null, $null) | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_UserContext) -and ($($WAUPolicies.WAU_UserContext) -ne $($WAUConfig.WAU_UserContext))) {
-                New-ItemProperty $regPath -Name WAU_UserContext -Value $($WAUPolicies.WAU_UserContext) -PropertyType DWord -Force | Out-Null
-                if ($WAUPolicies.WAU_UserContext -eq 1) {
-                    # Settings for the scheduled task in User context
-                    $taskAction = New-ScheduledTaskAction -Execute "wscript.exe" -Argument "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\winget-upgrade.ps1`"`""
-                    $taskUserPrincipal = New-ScheduledTaskPrincipal -GroupId S-1-5-11
-                    $taskSettings = New-ScheduledTaskSettingsSet -Compatibility Win8 -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit 03:00:00
-
-                    # Set up the task for user apps
-                    $task = New-ScheduledTask -Action $taskAction -Principal $taskUserPrincipal -Settings $taskSettings
-                    Register-ScheduledTask -TaskName 'Winget-AutoUpdate-UserContext' -InputObject $task -Force
-                }
-                else {
-                    Get-ScheduledTask -TaskName "Winget-AutoUpdate-UserContext" -ErrorAction SilentlyContinue | Unregister-ScheduledTask -Confirm:$False
-                }
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_UserContext) -and ($($WAUConfig.WAU_UserContext) -or $($WAUConfig.WAU_UserContext) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_UserContext -Force -ErrorAction SilentlyContinue | Out-Null
-                Get-ScheduledTask -TaskName "Winget-AutoUpdate-UserContext" -ErrorAction SilentlyContinue | Unregister-ScheduledTask -Confirm:$False
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_DesktopShortcut) -and ($($WAUPolicies.WAU_DesktopShortcut) -ne $($WAUConfig.WAU_DesktopShortcut))) {
-                New-ItemProperty $regPath -Name WAU_DesktopShortcut -Value $($WAUPolicies.WAU_DesktopShortcut) -PropertyType DWord -Force | Out-Null
-                if ($WAUPolicies.WAU_DesktopShortcut -eq 1) {
-                    Add-Shortcut "wscript.exe" "${env:Public}\Desktop\WAU - Check for updated Apps.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`"`"" "${env:SystemRoot}\System32\shell32.dll,-16739" "Manual start of Winget-AutoUpdate (WAU)..."
-                }
-                else {
-                    Remove-Item -Path "${env:Public}\Desktop\WAU - Check for updated Apps.lnk" -Force | Out-Null
-                }
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_DesktopShortcut) -and ($($WAUConfig.WAU_DesktopShortcut) -or $($WAUConfig.WAU_DesktopShortcut) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_DesktopShortcut -Force -ErrorAction SilentlyContinue | Out-Null
-                Remove-Item -Path "${env:Public}\Desktop\WAU - Check for updated Apps.lnk" -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_StartMenuShortcut) -and ($($WAUPolicies.WAU_StartMenuShortcut) -ne $($WAUConfig.WAU_StartMenuShortcut))) {
-                New-ItemProperty $regPath -Name WAU_StartMenuShortcut -Value $($WAUPolicies.WAU_StartMenuShortcut) -PropertyType DWord -Force | Out-Null
-                if ($WAUPolicies.WAU_StartMenuShortcut -eq 1) {
-                    if (!(Test-Path "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)")) {
-                        New-Item -ItemType Directory -Force -Path "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)" | Out-Null
-                    }
-                    Add-Shortcut "wscript.exe" "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)\WAU - Check for updated Apps.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`"`"" "${env:SystemRoot}\System32\shell32.dll,-16739" "Manual start of Winget-AutoUpdate (WAU)..."
-                    Add-Shortcut "wscript.exe" "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)\WAU - Open logs.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`" -Logs`"" "${env:SystemRoot}\System32\shell32.dll,-16763" "Open existing WAU logs..."
-                    Add-Shortcut "wscript.exe" "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)\WAU - Web Help.lnk" "`"$($WAUConfig.InstallLocation)\Invisible.vbs`" `"powershell.exe -NoProfile -ExecutionPolicy Bypass -File `"`"`"$($WAUConfig.InstallLocation)\user-run.ps1`" -Help`"" "${env:SystemRoot}\System32\shell32.dll,-24" "Help for WAU..."
-                }
-                else {
-                    Remove-Item -Path "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)" -Recurse -Force | Out-Null
-                }
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_StartMenuShortcut) -and ($($WAUConfig.WAU_StartMenuShortcut) -or $($WAUConfig.WAU_StartMenuShortcut) -eq 0)) {
-                Remove-ItemProperty $regPath -Name WAU_StartMenuShortcut -Force -ErrorAction SilentlyContinue | Out-Null
-                Remove-Item -Path "${env:ProgramData}\Microsoft\Windows\Start Menu\Programs\Winget-AutoUpdate (WAU)" -Recurse -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_MaxLogFiles) -and ($($WAUPolicies.WAU_MaxLogFiles) -ne $($WAUConfig.WAU_MaxLogFiles))) {
-                New-ItemProperty $regPath -Name WAU_MaxLogFiles -Value $($WAUPolicies.WAU_MaxLogFiles.TrimEnd(" ", "\", "/")) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_MaxLogFiles) -and $($WAUConfig.WAU_MaxLogFiles) -ne 3) {
-                New-ItemProperty $regPath -Name WAU_MaxLogFiles -Value 3 -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            if ($null -ne $($WAUPolicies.WAU_MaxLogSize) -and ($($WAUPolicies.WAU_MaxLogSize) -ne $($WAUConfig.WAU_MaxLogSize))) {
-                New-ItemProperty $regPath -Name WAU_MaxLogSize -Value $($WAUPolicies.WAU_MaxLogSize.TrimEnd(" ", "\", "/")) -Force | Out-Null
-                $ChangedSettings++
-            }
-            elseif ($null -eq $($WAUPolicies.WAU_MaxLogSize) -and $($WAUConfig.WAU_MaxLogSize) -ne 1048576) {
-                New-ItemProperty $regPath -Name WAU_MaxLogSize -Value 1048576 -Force | Out-Null
-                $ChangedSettings++
-            }
-
-            #Get WAU Configurations after Policies change
-            $Script:WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate"
-        }
-    }
-    Return $($WAUPolicies.WAU_ActivateGPOManagement), $ChangedSettings
-}
diff --git a/Winget-AutoUpdate/functions/Get-WAUConfig.ps1 b/Winget-AutoUpdate/functions/Get-WAUConfig.ps1
new file mode 100644
index 0000000..4bf1238
--- /dev/null
+++ b/Winget-AutoUpdate/functions/Get-WAUConfig.ps1
@@ -0,0 +1,26 @@
+#Function to get the WAU settings, including Domain/Local Policies (GPO)
+
+Function Get-WAUConfig {
+
+    #Get WAU Configurations
+    $WAUConfig = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate" -ErrorAction SilentlyContinue
+
+    #Get WAU Policies
+    $WAUPolicies = Get-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Romanitho\Winget-AutoUpdate" -ErrorAction SilentlyContinue
+
+    #If WAU Policies detected, apply settings
+    if ($($WAUPolicies.WAU_ActivateGPOManagement -eq 1)) {
+
+        Write-ToLog "WAU Policies management activated."
+
+        #Replace loaded configurations by ones from Policies in 'WAUConfig'
+        $WAUPolicies.PSObject.Properties | ForEach-Object {
+            $WAUConfig.PSObject.Properties.add($_)
+        }
+
+        #Add tag to activate WAU-Policies
+        New-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Winget-AutoUpdate" -Name WAU_ManagementTag -Value 1 -Force | Out-Null
+    }
+
+    return $WAUConfig
+}
\ No newline at end of file
diff --git a/Winget-AutoUpdate/functions/Invoke-PostUpdateActions.ps1 b/Winget-AutoUpdate/functions/Invoke-PostUpdateActions.ps1
index 8457249..d21cff4 100644
--- a/Winget-AutoUpdate/functions/Invoke-PostUpdateActions.ps1
+++ b/Winget-AutoUpdate/functions/Invoke-PostUpdateActions.ps1
@@ -174,6 +174,7 @@ function Invoke-PostUpdateActions {
 
     #Remove old functions / files
     $FileNames = @(
+        "$WorkingDir\functions\Get-Policies.ps1",
         "$WorkingDir\functions\Get-WAUConfig.ps1",
         "$WorkingDir\functions\Get-WAUCurrentVersion.ps1",
         "$WorkingDir\functions\Get-WAUUpdateStatus.ps1",