diff --git a/Tools/DecryptSigningKey.ps1 b/Tools/DecryptSigningKey.ps1
index c702383cf5..512b5973c1 100644
--- a/Tools/DecryptSigningKey.ps1
+++ b/Tools/DecryptSigningKey.ps1
@@ -3,54 +3,20 @@ if (-not (Test-Path env:snk_passphrase))
 	exit
 }
 
-[Reflection.Assembly]::LoadWithPartialName("System.Security")
-
-function Decrypt-String($Encrypted, $Passphrase, $salt="SaltCrypto", $init="IV_Password")
-{
-	# If the value in the Encrypted is a string, convert it to Base64
-	if($Encrypted -is [string]){
-		$Encrypted = [Convert]::FromBase64String($Encrypted)
-   	}
-
-	# Create a COM Object for RijndaelManaged Cryptography
-	$r = new-Object System.Security.Cryptography.RijndaelManaged
-	# Convert the Passphrase to UTF8 Bytes
-	$pass = [Text.Encoding]::UTF8.GetBytes($Passphrase)
-	# Convert the Salt to UTF Bytes
-	$salt = [Text.Encoding]::UTF8.GetBytes($salt)
-
-	# Create the Encryption Key using the passphrase, salt and SHA1 algorithm at 256 bits
-	$r.Key = (new-Object Security.Cryptography.PasswordDeriveBytes $pass, $salt, "SHA1", 5).GetBytes(32) #256/8
-	# Create the Intersecting Vector Cryptology Hash with the init
-	$r.IV = (new-Object Security.Cryptography.SHA1Managed).ComputeHash( [Text.Encoding]::UTF8.GetBytes($init) )[0..15]
-
-
-	# Create a new Decryptor
-	$d = $r.CreateDecryptor()
-	# Create a New memory stream with the encrypted value.
-	$ms = new-Object IO.MemoryStream @(,$Encrypted)
-	# Read the new memory stream and read it in the cryptology stream
-	$cs = new-Object Security.Cryptography.CryptoStream $ms,$d,"Read"
-	# Read the new decrypted stream
-	$sr = new-Object IO.StreamReader $cs
-	# Return from the function the stream
-	Write-Output $sr.ReadToEnd()
-	# Stops the stream	
-	$sr.Close()
-	# Stops the crypology stream
-	$cs.Close()
-	# Stops the memory stream
-	$ms.Close()
-	# Clears the RijndaelManaged Cryptology IV and Key
-	$r.Clear()
-}
 $bf = $Env:APPVEYOR_BUILD_FOLDER
 
-$encrypted = [IO.File]::ReadAllText("$bf/Tools/TGStationServer3.enc.snk")
+$flags = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::Exportable -bor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet
 
-$base64string = Decrypt-String $encrypted $Env:snk_passphrase "SNK-Encrypt" "IV-HashCompute"
+$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2 -ArgumentList "$bf/Tools/TGStationServer3.pfx", $env:snk_passphrase, $flags
 
-$rawstring = [System.Convert]::FromBase64String($base64string)
-[IO.File]::WriteAllBytes("$bf/TGStationServer3.snk", $rawstring)
+$provider = [System.Security.Cryptography.RSACryptoServiceProvider]$cert.PrivateKey;
 
-Add-Content "$bf/AssemblyInfo.global.cs" "[assembly: AssemblyKeyFile(`"TGStationServer3.snk`")]"
\ No newline at end of file
+$rawstring = $provider.ExportCspBlob($true)
+
+[System.IO.File]::WriteAllBytes("$bf/Tools/TGStationServer3.snk", $rawstring);
+
+&'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\sn.exe' -i "$bf/Tools/TGStationServer3.snk" TGStationServer3
+
+Remove-Item "$bf/Tools/TGStationServer3.snk"
+
+$env:snk_passphrase = ""