diff --git a/Scripts/ReVanced_CLI.ps1 b/Scripts/ReVanced_CLI.ps1
index 029df16..bf3a70f 100644
--- a/Scripts/ReVanced_CLI.ps1
+++ b/Scripts/ReVanced_CLI.ps1
@@ -5,7 +5,7 @@ $Parameters = @{
     Verbose         = $true
 }
 $apiResult = Invoke-RestMethod @Parameters
-$URL = $apiResult.assets.browser_download_url
+$URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "application/java-archive"}).browser_download_url
 $TAG = $apiResult.tag_name
 $Parameters = @{
     Uri             = $URL
diff --git a/Scripts/ReVanced_Intergrations.ps1 b/Scripts/ReVanced_Intergrations.ps1
index 2158502..55ab6cc 100644
--- a/Scripts/ReVanced_Intergrations.ps1
+++ b/Scripts/ReVanced_Intergrations.ps1
@@ -5,7 +5,7 @@ $Parameters = @{
     Verbose         = $true
 }
 $apiResult = Invoke-RestMethod @Parameters
-$URL = $apiResult.assets.browser_download_url
+$URL = ($apiResult.assets | Where-Object -FilterScript {$_.content_type -eq "application/vnd.android.package-archive"}).browser_download_url
 $TAG = $apiResult.tag_name
 $Parameters = @{
     Uri             = $URL
diff --git a/Scripts/YouTube.ps1 b/Scripts/YouTube.ps1
index 9a6ee6f..2b54f00 100644
--- a/Scripts/YouTube.ps1
+++ b/Scripts/YouTube.ps1
@@ -8,56 +8,21 @@ $Parameters = @{
 $JSON = Invoke-RestMethod @Parameters
 $versions = ($JSON | Where-Object -FilterScript {$_.compatiblePackages.name -eq "com.google.android.youtube"}).compatiblePackages.versions
 $LatestSupported = $versions | Sort-Object -Descending -Unique | Select-Object -First 1
-$LatestSupportedYT = $LatestSupported.replace(".", "-")
 
-$AngleSharpAssemblyPath = (Get-ChildItem -Path (Split-Path -Path (Get-Package -Name AngleSharp).Source) -Filter "*.dll" -Recurse | Where-Object -FilterScript {$_ -match "standard"} | Select-Object -Last 1).FullName
-Add-Type -Path $AngleSharpAssemblyPath
-
-# Create parser object
-$angleparser = New-Object -TypeName AngleSharp.Html.Parser.HtmlParser
-
-# Try to find correct NON-Bundle version
+# We need a NON-bundle version
+# https://apkpure.net/ru/youtube/com.google.android.youtube/versions
 $Parameters = @{
-    Uri             = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupportedYT)-release/youtube-$($LatestSupportedYT)-android-apk-download/"
-    UseBasicParsing = $false # Disabled
-    Verbose         = $true
+	Uri             = "https://apkpure.net/youtube/com.google.android.youtube/download/$($LatestSupported)"
+	UseBasicParsing = $true
+	Verbose         = $true
 }
-$URLParse = (Invoke-Webrequest @Parameters).Links.outerHTML | Where-Object -FilterScript {$_ -like "*YouTube $($LatestSupported) (nodpi)*"}
-# Check if variable contains a data
-if ($URLParse)
-{
-    $URL = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupportedYT)-release/youtube-$($LatestSupportedYT)-android-apk-download/"
-}
-else
-{
-    $URL = "https://www.apkmirror.com/apk/google-inc/youtube/youtube-$($LatestSupportedYT)-release/youtube-$($LatestSupportedYT)-2-android-apk-download/"
-}
-
-# Get unique key to generate direct link
-$Parameters = @{
-    Uri             = $URL
-    UseBasicParsing = $false # Disabled
-    Verbose         = $true
-}
-$Request = Invoke-Webrequest @Parameters
-$Parsed = $angleparser.ParseDocument($Request.Content)
-$Key = $Parsed.All | Where-Object -FilterScript {$_.ClassName -match "accent_bg btn btn-flat downloadButton"} | ForEach-Object -Process {$_.Search}
+$URL = (Invoke-Webrequest @Parameters).Links.href | Where-Object -FilterScript {$_ -match "APK/com.google.android.youtube"} | Select-Object -Index 1
 
 $Parameters = @{
-    Uri             = "$($URL)/download/$($Key)"
-    UseBasicParsing = $true
-    Verbose         = $true
-}
-$Request = Invoke-Webrequest @Parameters
-$Parsed = $angleparser.ParseDocument($Request.Content)
-$Key = ($Parsed.All | Where-Object -FilterScript { $_.InnerHtml -eq "here" }).Search
-
-# Finally, get the real link
-$Parameters = @{
-    Uri             = "https://www.apkmirror.com/wp-content/themes/APKMirror/download.php$Key"
-    OutFile         = "Temp\youtube.apk"
-    UseBasicParsing = $true
-    Verbose         = $true
+	Uri             = $URL
+	OutFile         = "Temp\youtube.apk"
+	UseBasicParsing = $true
+	Verbose         = $true
 }
 Invoke-Webrequest @Parameters