diff --git a/Program.cs b/Program.cs
index d47fcbd..973a4a0 100644
--- a/Program.cs
+++ b/Program.cs
@@ -8,27 +8,32 @@ var builder = Host.CreateApplicationBuilder(args);
 var config = AppConfigLoader.LoadConfigFromEnv();
 builder.Services.AddSingleton(config);
 
-var repositoryConfig = await RepoConfigLoader.LoadConfigAsync(
-    config.RepositoryConfigFilePath);
+var repositoryConfig = await RepoConfigLoader.LoadConfigAsync(config.RepositoryConfigFilePath);
 builder.Services.AddSingleton(repositoryConfig);
 
-builder.Services.AddHttpClient<GithubService>(client =>
+builder.Services.AddHttpClient("github", client =>
 {
     client.BaseAddress = new Uri("https://api.github.com/");
     client.DefaultRequestHeaders.UserAgent.ParseAdd("ForgejoReleaseSync");
     client.DefaultRequestHeaders.Accept.ParseAdd("application/vnd.github+json");
 });
 
-builder.Services.AddHttpClient<ForgejoService>(client =>
+builder.Services.AddHttpClient("forgejo", client =>
+{
+    client.BaseAddress = new Uri(config.ForgejoInstacne.TrimEnd('/') + "/");
+    client.DefaultRequestHeaders.UserAgent.ParseAdd("ForgejoReleaseSync");
+    client.DefaultRequestHeaders.Authorization =
+        new AuthenticationHeaderValue("token", config.ForgejoToken);
+});
+
+builder.Services.AddHttpClient("asset-download", client =>
 {
-    client.BaseAddress = new Uri(config.ForgejoInstacne);
     client.DefaultRequestHeaders.UserAgent.ParseAdd("ForgejoReleaseSync");
-    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("token", config.ForgejoToken);
 });
 
-builder.Services.AddSingleton<ReleaseAssetDownloadService>();
 builder.Services.AddSingleton<GithubService>();
 builder.Services.AddSingleton<ForgejoService>();
+builder.Services.AddSingleton<ReleaseAssetDownloadService>();
 builder.Services.AddSingleton<SyncService>();
 
 var app = builder.Build();
diff --git a/Services/ForgejoService.cs b/Services/ForgejoService.cs
index b6c3474..b86fe2b 100644
--- a/Services/ForgejoService.cs
+++ b/Services/ForgejoService.cs
@@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging;
 
 namespace ForgejoReleaseSync.Services;
 
-public class ForgejoService(HttpClient httpClient, AppConfig config, ILogger<ForgejoService> logger)
+public class ForgejoService(IHttpClientFactory httpClientFactory, ILogger<ForgejoService> logger)
 {
     public async Task<ForgejoReleaseResponseDto> CreateReleaseAsync(
         string owner, string repo, string body, string name, string tagName, CancellationToken token = default)
@@ -16,10 +16,13 @@ public class ForgejoService(HttpClient httpClient, AppConfig config, ILogger<For
             var dto = new ForgejoCreateReleaseDto(body, false, false, name, false, tagName, "");
             var json = JsonSerializer.Serialize(dto, AppJsonSerializerContext.Default.ForgejoCreateReleaseDto);
 
+            var httpClient = httpClientFactory.CreateClient("forgejo");
+
             using var request = new HttpRequestMessage(
-                HttpMethod.Post,
-                new Uri($"{config.ForgejoInstacne}/api/v1/repos/{owner}/{repo}/releases"));
-            request.Content = new StringContent(json, Encoding.UTF8, "application/json");
+                HttpMethod.Post, $"api/v1/repos/{owner}/{repo}/releases")
+            {
+                Content = new StringContent(json, Encoding.UTF8, "application/json")
+            };
 
             using var response = await httpClient.SendAsync(request, token);
             response.EnsureSuccessStatusCode();
@@ -42,9 +45,10 @@ public class ForgejoService(HttpClient httpClient, AppConfig config, ILogger<For
     {
         try
         {
+            var httpClient = httpClientFactory.CreateClient("forgejo");
+
             using var response = await httpClient.GetAsync(
-                new Uri($"{config.ForgejoInstacne}/api/v1/repos/{owner}/{repo}/releases?per_page=3&page=1"),
-                token);
+                $"api/v1/repos/{owner}/{repo}/releases?per_page=3&page=1", token);
             response.EnsureSuccessStatusCode();
 
             await using var stream = await response.Content.ReadAsStreamAsync(token);
@@ -65,6 +69,8 @@ public class ForgejoService(HttpClient httpClient, AppConfig config, ILogger<For
     {
         try
         {
+            var httpClient = httpClientFactory.CreateClient("forgejo");
+
             await using var fileStream = new FileStream(
                 filePath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, useAsync: true);
 
@@ -76,8 +82,10 @@ public class ForgejoService(HttpClient httpClient, AppConfig config, ILogger<For
 
             using var request = new HttpRequestMessage(
                 HttpMethod.Post,
-                new Uri($"{config.ForgejoInstacne}/api/v1/repos/{owner}/{repo}/releases/{releaseId}/assets"));
-            request.Content = formData;
+                $"api/v1/repos/{owner}/{repo}/releases/{releaseId}/assets")
+            {
+                Content = formData
+            };
 
             using var response = await httpClient.SendAsync(
                 request, HttpCompletionOption.ResponseHeadersRead, token);
diff --git a/Services/GithubService.cs b/Services/GithubService.cs
index 01e1045..e38e7f8 100644
--- a/Services/GithubService.cs
+++ b/Services/GithubService.cs
@@ -6,16 +6,17 @@ using Microsoft.Extensions.Logging;
 
 namespace ForgejoReleaseSync.Services;
 
-public class GithubService(HttpClient httpClient, ILogger<GithubService> logger)
+public class GithubService(IHttpClientFactory httpClientFactory, ILogger<GithubService> logger)
 {
     public async Task<List<GithubReleaseResponseDto>> FetchRepoReleasesAsync(
         string owner, string repo, CancellationToken token = default)
     {
         try
         {
+            var httpClient = httpClientFactory.CreateClient("github");
+
             using var response = await httpClient.GetAsync(
-                new Uri($"https://api.github.com/repos/{owner}/{repo}/releases?per_page=3&page=1"),
-                token);
+                $"repos/{owner}/{repo}/releases?per_page=3&page=1", token);
             response.EnsureSuccessStatusCode();
 
             await using var stream = await response.Content.ReadAsStreamAsync(token);
diff --git a/Services/ReleaseAssetDownloadService.cs b/Services/ReleaseAssetDownloadService.cs
index 2a5b881..a1b184b 100644
--- a/Services/ReleaseAssetDownloadService.cs
+++ b/Services/ReleaseAssetDownloadService.cs
@@ -2,12 +2,14 @@ using Microsoft.Extensions.Logging;
 
 namespace ForgejoReleaseSync.Services;
 
-public class ReleaseAssetDownloadService(HttpClient httpClient, ILogger<ReleaseAssetDownloadService> logger)
+public class ReleaseAssetDownloadService(IHttpClientFactory httpClientFactory, ILogger<ReleaseAssetDownloadService> logger)
 {
     public async Task<string> DownloadReleaseAssetAsync(Uri url, CancellationToken token = default)
     {
         try
         {
+            var httpClient = httpClientFactory.CreateClient("asset-download");
+
             var fileName = Path.GetFileName(url.AbsoluteUri);
             var filePath = Path.Combine(Path.GetTempPath(), fileName);