diff --git a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs
index 31fc74fb2d..165047dcae 100644
--- a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs
@@ -7,7 +7,6 @@ using Octokit;
 
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Api.Models.Internal;
-using Tgstation.Server.Host.Extensions;
 using Tgstation.Server.Host.Utils.GitHub;
 
 namespace Tgstation.Server.Host.Components.Repository
@@ -33,20 +32,20 @@ namespace Tgstation.Server.Host.Components.Repository
 		public override string RemoteRepositoryName { get; }
 
 		/// <summary>
-		/// The <see cref="IGitHubClientFactory"/> for the <see cref="GitHubRemoteFeatures"/>.
+		/// The <see cref="IGitHubServiceFactory"/> for the <see cref="GitHubRemoteFeatures"/>.
 		/// </summary>
-		readonly IGitHubClientFactory gitHubClientFactory;
+		readonly IGitHubServiceFactory gitHubServiceFactory;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="GitHubRemoteFeatures"/> class.
 		/// </summary>
-		/// <param name="gitHubClientFactory">The value of <see cref="gitHubClientFactory"/>.</param>
+		/// <param name="gitHubServiceFactory">The value of <see cref="gitHubServiceFactory"/>.</param>
 		/// <param name="logger">The <see cref="ILogger"/> for the <see cref="GitRemoteFeaturesBase"/>.</param>
 		/// <param name="remoteUrl">The remote repository <see cref="Uri"/>.</param>
-		public GitHubRemoteFeatures(IGitHubClientFactory gitHubClientFactory, ILogger<GitHubRemoteFeatures> logger, Uri remoteUrl)
+		public GitHubRemoteFeatures(IGitHubServiceFactory gitHubServiceFactory, ILogger<GitHubRemoteFeatures> logger, Uri remoteUrl)
 			: base(logger, remoteUrl)
 		{
-			this.gitHubClientFactory = gitHubClientFactory ?? throw new ArgumentNullException(nameof(gitHubClientFactory));
+			this.gitHubServiceFactory = gitHubServiceFactory ?? throw new ArgumentNullException(nameof(gitHubServiceFactory));
 
 			if (remoteUrl == null)
 				throw new ArgumentNullException(nameof(remoteUrl));
@@ -63,20 +62,16 @@ namespace Tgstation.Server.Host.Components.Repository
 			RepositorySettings repositorySettings,
 			CancellationToken cancellationToken)
 		{
-			var gitHubClient = repositorySettings.AccessToken != null
-				? gitHubClientFactory.CreateClient(repositorySettings.AccessToken)
-				: gitHubClientFactory.CreateClient();
+			var gitHubService = repositorySettings.AccessToken != null
+				? gitHubServiceFactory.CreateService(repositorySettings.AccessToken)
+				: gitHubServiceFactory.CreateService();
 
 			PullRequest pr = null;
 			ApiException exception = null;
 			string errorMessage = null;
 			try
 			{
-				pr = await gitHubClient
-					.PullRequest
-					.Get(RemoteRepositoryOwner, RemoteRepositoryName, parameters.Number)
-					.WithToken(cancellationToken)
-					;
+				pr = await gitHubService.GetPullRequest(RemoteRepositoryOwner, RemoteRepositoryName, parameters.Number, cancellationToken);
 			}
 			catch (RateLimitExceededException ex)
 			{
diff --git a/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesFactory.cs b/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesFactory.cs
index 21a3d7263e..e19b4c22f0 100644
--- a/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesFactory.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesFactory.cs
@@ -11,9 +11,9 @@ namespace Tgstation.Server.Host.Components.Repository
 	sealed class GitRemoteFeaturesFactory : IGitRemoteFeaturesFactory
 	{
 		/// <summary>
-		/// The <see cref="IGitHubClientFactory"/> for the <see cref="GitRemoteFeaturesFactory"/>.
+		/// The <see cref="IGitHubServiceFactory"/> for the <see cref="GitRemoteFeaturesFactory"/>.
 		/// </summary>
-		readonly IGitHubClientFactory gitHubClientFactory;
+		readonly IGitHubServiceFactory gitHubServiceFactory;
 
 		/// <summary>
 		/// The <see cref="ILoggerFactory"/> for the <see cref="GitRemoteFeaturesFactory"/>.
@@ -28,15 +28,15 @@ namespace Tgstation.Server.Host.Components.Repository
 		/// <summary>
 		/// Initializes a new instance of the <see cref="GitRemoteFeaturesFactory"/> class.
 		/// </summary>
-		/// <param name="gitHubClientFactory">The value of <see cref="gitHubClientFactory"/>.</param>
+		/// <param name="gitHubServiceFactory">The value of <see cref="gitHubServiceFactory"/>.</param>
 		/// <param name="loggerFactory">The value of <see cref="loggerFactory"/>.</param>
 		/// <param name="logger">The value of <see cref="logger"/>.</param>
 		public GitRemoteFeaturesFactory(
-			IGitHubClientFactory gitHubClientFactory,
+			IGitHubServiceFactory gitHubServiceFactory,
 			ILoggerFactory loggerFactory,
 			ILogger<GitRemoteFeaturesFactory> logger)
 		{
-			this.gitHubClientFactory = gitHubClientFactory ?? throw new ArgumentNullException(nameof(gitHubClientFactory));
+			this.gitHubServiceFactory = gitHubServiceFactory ?? throw new ArgumentNullException(nameof(gitHubServiceFactory));
 			this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
 			this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
 		}
@@ -52,7 +52,7 @@ namespace Tgstation.Server.Host.Components.Repository
 			return remoteGitProvider switch
 			{
 				RemoteGitProvider.GitHub => new GitHubRemoteFeatures(
-					gitHubClientFactory,
+					gitHubServiceFactory,
 					loggerFactory.CreateLogger<GitHubRemoteFeatures>(),
 					primaryRemote),
 				RemoteGitProvider.GitLab => new GitLabRemoteFeatures(