diff --git a/NftFaucet/ApiClients/ICrustApiClient.cs b/NftFaucet/ApiClients/ICrustApiClient.cs
index ec42738..e8c5b73 100644
--- a/NftFaucet/ApiClients/ICrustApiClient.cs
+++ b/NftFaucet/ApiClients/ICrustApiClient.cs
@@ -3,12 +3,12 @@ using RestEase;
 
 namespace NftFaucet.ApiClients;
 
-[BaseAddress("https://gw.crustapps.net")]
+[BaseAddress("https://pin.crustcode.com")]
 public interface ICrustApiClient
 {
     [Header("Authorization")]
     public string Auth { get; set; }
 
-    [Post("api/v0/add")]
-    Task<UploadResponse> UploadFile([Body] MultipartContent content, [Query("pin")] bool pin = true);
+    [Post("psa/pins")]
+    Task PinFile([Body] PinRequest request);
 }
diff --git a/NftFaucet/ApiClients/IInfuraIpfsApiClient.cs b/NftFaucet/ApiClients/IInfuraIpfsApiClient.cs
new file mode 100644
index 0000000..4546c66
--- /dev/null
+++ b/NftFaucet/ApiClients/IInfuraIpfsApiClient.cs
@@ -0,0 +1,11 @@
+using NftFaucet.ApiClients.Models;
+using RestEase;
+
+namespace NftFaucet.ApiClients;
+
+[BaseAddress("https://ipfs.infura.io:5001")]
+public interface IInfuraIpfsApiClient
+{
+    [Post("api/v0/add")]
+    Task<UploadResponse> UploadFile([Body] MultipartContent content, [Query("stream-channels")] bool streamChannels = true);
+}
diff --git a/NftFaucet/ApiClients/Models/PinRequest.cs b/NftFaucet/ApiClients/Models/PinRequest.cs
new file mode 100644
index 0000000..bdac903
--- /dev/null
+++ b/NftFaucet/ApiClients/Models/PinRequest.cs
@@ -0,0 +1,7 @@
+namespace NftFaucet.ApiClients.Models;
+
+public class PinRequest
+{
+    public string cid { get; set; }
+    public string name { get; set; }
+}
diff --git a/NftFaucet/Models/StateStorage.cs b/NftFaucet/Models/StateStorage.cs
index 0a696d2..4434c6c 100644
--- a/NftFaucet/Models/StateStorage.cs
+++ b/NftFaucet/Models/StateStorage.cs
@@ -6,7 +6,7 @@ public class StateStorage
 {
     public string TokenName { get; set; }
     public string TokenDescription { get; set; }
-    public IpfsGatewayType IpfsGatewayType { get; set; } = IpfsGatewayType.Crust;
+    public IpfsGatewayType IpfsGatewayType { get; set; } = IpfsGatewayType.Infura;
     public TokenType TokenType { get; set; } = TokenType.ERC721;
     public double TokenAmount { get; set; } = 1;
     public Uri LocalImageUrl { get; set; }
diff --git a/NftFaucet/Pages/Step1Page.razor b/NftFaucet/Pages/Step1Page.razor
index d8521c8..db1a838 100644
--- a/NftFaucet/Pages/Step1Page.razor
+++ b/NftFaucet/Pages/Step1Page.razor
@@ -71,7 +71,7 @@
                             </SpaceItem>
                             <SpaceItem>
                                 <Select DataSource="@IpfsGateways"
-                                        DefaultValue="@(nameof(IpfsGatewayType.Crust))"
+                                        DefaultValue="@(nameof(IpfsGatewayType.Infura))"
                                         ValueName="@nameof(EnumWrapper<IpfsGatewayType>.ValueString)"
                                         LabelName="@nameof(EnumWrapper<IpfsGatewayType>.Description)"
                                         OnSelectedItemChanged="OnIpfsGatewayChange">
diff --git a/NftFaucet/Services/IpfsService.cs b/NftFaucet/Services/IpfsService.cs
index e112bcf..cb6a5fb 100644
--- a/NftFaucet/Services/IpfsService.cs
+++ b/NftFaucet/Services/IpfsService.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using NftFaucet.ApiClients;
+using NftFaucet.ApiClients.Models;
 using NftFaucet.Models;
 using NftFaucet.Models.Enums;
 using NftFaucet.Options;
@@ -48,9 +49,18 @@ public class IpfsService : IIpfsService
     public async Task<Uri> Upload(string fileName, string fileType, byte[] fileBytes)
     {
         var fileUploadRequest = ToMultipartContent(fileName, fileType, fileBytes);
-        var client = RestClient.For<ICrustApiClient>();
-        client.Auth = GenerateAuthHeader();
-        var response = await client.UploadFile(fileUploadRequest);
+        var uploadClient = RestClient.For<IInfuraIpfsApiClient>();
+        var response = await uploadClient.UploadFile(fileUploadRequest);
+
+        var pinningClient = RestClient.For<ICrustApiClient>();
+        pinningClient.Auth = GenerateAuthHeader();
+        var pinRequest = new PinRequest
+        {
+            cid = response.Hash,
+            name = fileName,
+        };
+        await pinningClient.PinFile(pinRequest);
+
         var uri = IpfsUrlPrefix + response.Hash;
         return new Uri(uri);
     }