diff --git a/BTCPayServer.Plugins.Branta.Tests/Services/BrantaServiceTests.cs b/BTCPayServer.Plugins.Branta.Tests/Services/BrantaServiceTests.cs
index a8477d1..8ae2190 100644
--- a/BTCPayServer.Plugins.Branta.Tests/Services/BrantaServiceTests.cs
+++ b/BTCPayServer.Plugins.Branta.Tests/Services/BrantaServiceTests.cs
@@ -1,6 +1,9 @@
-using BTCPayServer.Models.InvoicingModels;
+using Branta.Classes;
+using Branta.Enums;
+using Branta.V2.Classes;
+using Branta.V2.Models;
+using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
-using BTCPayServer.Plugins.Branta.Classes;
 using BTCPayServer.Plugins.Branta.Data.Domain;
 using BTCPayServer.Plugins.Branta.Enums;
 using BTCPayServer.Plugins.Branta.Interfaces;
@@ -9,9 +12,11 @@
 using BTCPayServer.Plugins.Branta.Tests.Classes;
 using BTCPayServer.Services.Invoices;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Moq;
 using Moq.Protected;
 using System.Net;
+using System.Text.Json;
 
 namespace BTCPayServer.Plugins.Branta.Tests.Services;
 
@@ -51,7 +56,19 @@ public BrantaServiceTests()
                 {
                     return new HttpResponseMessage
                     {
-                        StatusCode = HttpStatusCode.Created
+                        StatusCode = HttpStatusCode.Created,
+                        Content = new StringContent(
+                            JsonSerializer.Serialize(new Payment()
+                            {
+                                Destinations = [
+                                    new Destination() {
+                                        Value = "pQerSFV+fievHP+guYoGJjx1CzFFrYWHAgWrLhn5473Z19M6+WMScLd1hsk808AEF/x+GpZKmNacFBf5BbQ=",
+                                        IsZk = true
+                                    }
+                                ]
+                            }),
+                            System.Text.Encoding.UTF8,
+                            "application/json")
                     };
                 }
                 else
@@ -67,7 +84,14 @@ public BrantaServiceTests()
             .Setup(x => x.CreateClient(It.IsAny<string>()))
             .Returns(new HttpClient(_httpMessageHandlerMock.Object));
 
-        _brantaClientMock = new Mock<BrantaClient>(httpClientFactoryMock.Object);
+        var defaultOptions = new BrantaClientOptions
+        {
+            BaseUrl = BrantaServerBaseUrl.Localhost
+        };
+        var optionsMock = new Mock<IOptions<BrantaClientOptions>>();
+        optionsMock.Setup(x => x.Value).Returns(defaultOptions);
+
+        _brantaClientMock = new Mock<BrantaClient>(httpClientFactoryMock.Object, optionsMock.Object);
 
         _brantaService = new BrantaService(
             _loggerMock.Object,
@@ -162,7 +186,7 @@ public async Task CreateInvoiceIfNotExists_CreatesZeroKnowledgeInvoice()
         var secret = TestHelper.GetSecret(result);
         var value = TestHelper.GetValueFromZeroKnowledgeUrl(result);
         Assert.NotNull(value);
-        var decryptedValue = TestHelper.Decrypt(value, secret);
+        var decryptedValue = TestHelper.Decrypt(value, "1234");
         Assert.Equal(OnChainAddress, decryptedValue);
 
         _invoiceServiceMock.Verify(
diff --git a/BTCPayServer.Plugins.Branta/BTCPayServer.Plugins.Branta.csproj b/BTCPayServer.Plugins.Branta/BTCPayServer.Plugins.Branta.csproj
index 270c1ff..39ec69e 100644
--- a/BTCPayServer.Plugins.Branta/BTCPayServer.Plugins.Branta.csproj
+++ b/BTCPayServer.Plugins.Branta/BTCPayServer.Plugins.Branta.csproj
@@ -8,6 +8,7 @@
     <Product>Branta</Product>
     <Description>Easily verify payments, checkouts, and invoices.</Description>
     <Version>0.4.0</Version>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <!-- Plugin development properties -->
@@ -43,6 +44,11 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
   </ItemGroup>
 
+
+  <ItemGroup>
+    <PackageReference Include="Branta" Version="0.0.4" />
+  </ItemGroup>
+
   <!-- If you reference another project, by default, the dlls won't be copied in the published plugin, you need <Private>true</Private> -->
   <!--
   <ItemGroup>
diff --git a/BTCPayServer.Plugins.Branta/BrantaPlugin.cs b/BTCPayServer.Plugins.Branta/BrantaPlugin.cs
index 9e95b85..e9cc96f 100644
--- a/BTCPayServer.Plugins.Branta/BrantaPlugin.cs
+++ b/BTCPayServer.Plugins.Branta/BrantaPlugin.cs
@@ -1,7 +1,7 @@
+using Branta.V2.Extensions;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Payments;
-using BTCPayServer.Plugins.Branta.Classes;
 using BTCPayServer.Plugins.Branta.Interfaces;
 using BTCPayServer.Plugins.Branta.Services;
 using Microsoft.Extensions.DependencyInjection;
@@ -27,12 +27,11 @@ public override void Execute(IServiceCollection services)
             factory.ConfigureBuilder(o);
         });
 
+        services.ConfigureBrantaServices();
         services.AddScoped<IBrantaService, BrantaService>();
         services.AddScoped<IBrantaSettingsService, BrantaSettingsService>();
         services.AddScoped<IInvoiceService, InvoiceService>();
         services.AddScoped<IInvoiceRepository, InvoiceRepositoryAdapter>();
-        services.AddHttpClient();
-        services.AddScoped<BrantaClient>();
         services.AddScheduledTask<CleanUpInvoiceService>(TimeSpan.FromHours(24));
 
         services.AddScoped<IGlobalCheckoutModelExtension, BrantaCheckoutModelExtension>();
diff --git a/BTCPayServer.Plugins.Branta/Classes/BrantaClient.cs b/BTCPayServer.Plugins.Branta/Classes/BrantaClient.cs
deleted file mode 100644
index 3b3a5f2..0000000
--- a/BTCPayServer.Plugins.Branta/Classes/BrantaClient.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using BTCPayServer.Plugins.Branta.Models;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BTCPayServer.Plugins.Branta.Classes;
-
-public class BrantaClient(IHttpClientFactory httpClientFactory)
-{
-    public static readonly string PaymentVersion = "v2";
-
-    private JsonSerializerSettings _jsonSettings = new()
-    {
-        ContractResolver = new CamelCasePropertyNamesContractResolver()
-    };
-
-    public async Task PostPaymentAsync(PaymentRequest paymentRequest, BrantaSettings brantaSettings)
-    {
-
-        var json = JsonConvert.SerializeObject(paymentRequest, _jsonSettings);
-        var content = new StringContent(json, Encoding.UTF8, "application/json");
-
-        using var request = new HttpRequestMessage(HttpMethod.Post, $"{PaymentVersion}/payments")
-        {
-            Content = content
-        };
-
-        request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", brantaSettings.GetAPIKey());
-
-        var httpClient = httpClientFactory.CreateClient();
-        httpClient.BaseAddress = new Uri(brantaSettings.GetBrantaServerUrl());
-
-        var response = await httpClient.SendAsync(request);
-
-        if (response.StatusCode != HttpStatusCode.Created)
-        {
-            throw new BrantaPaymentException(response.StatusCode.ToString());
-        }
-    }
-}
-
-public class PaymentRequest
-{
-    public List<Destination> Destinations { get; set; }
-
-    public string Description { get; set; }
-
-    public string Ttl { get; set; }
-
-    public string BtcPayServerPluginVersion { get; set; }
-}
-
-public class Destination
-{
-    public string Value { get; set; }
-
-    public bool Zk { get; set; }
-}
diff --git a/BTCPayServer.Plugins.Branta/Classes/BrantaPaymentException.cs b/BTCPayServer.Plugins.Branta/Classes/BrantaPaymentException.cs
deleted file mode 100644
index 32c105e..0000000
--- a/BTCPayServer.Plugins.Branta/Classes/BrantaPaymentException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace BTCPayServer.Plugins.Branta.Classes;
-
-public class BrantaPaymentException(string message) : Exception(message)
-{
-}
diff --git a/BTCPayServer.Plugins.Branta/Classes/Helper.cs b/BTCPayServer.Plugins.Branta/Classes/Helper.cs
index 1c64058..fd77c10 100644
--- a/BTCPayServer.Plugins.Branta/Classes/Helper.cs
+++ b/BTCPayServer.Plugins.Branta/Classes/Helper.cs
@@ -1,7 +1,4 @@
 using BTCPayServer.Models.InvoicingModels;
-using System;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace BTCPayServer.Plugins.Branta.Classes;
 
@@ -23,35 +20,4 @@ public static void SetZeroKnowledgeParams(this CheckoutModel model, string payme
             (model.InvoiceBitcoinUrlQR.Contains('?') ? "&" : "?") +
             $"{Constants.PaymentId}={payment}&{Constants.ZeroKnowledgeSecret}={secret}";
     }
-
-    public static string Encrypt(string value, string secret)
-    {
-        byte[] keyData;
-        using (var sha256 = SHA256.Create())
-        {
-            keyData = sha256.ComputeHash(Encoding.UTF8.GetBytes(secret));
-        }
-
-        byte[] iv = new byte[12];
-        using (var rng = RandomNumberGenerator.Create())
-        {
-            rng.GetBytes(iv);
-        }
-
-        byte[] plaintext = Encoding.UTF8.GetBytes(value);
-        byte[] ciphertext = new byte[plaintext.Length];
-        byte[] tag = new byte[16];
-
-        using (AesGcm aesGcm = new(keyData, 16))
-        {
-            aesGcm.Encrypt(iv, plaintext, ciphertext, tag);
-        }
-
-        byte[] result = new byte[iv.Length + ciphertext.Length + tag.Length];
-        Buffer.BlockCopy(iv, 0, result, 0, iv.Length);
-        Buffer.BlockCopy(ciphertext, 0, result, iv.Length, ciphertext.Length);
-        Buffer.BlockCopy(tag, 0, result, iv.Length + ciphertext.Length, tag.Length);
-
-        return Convert.ToBase64String(result);
-    }
 }
diff --git a/BTCPayServer.Plugins.Branta/Data/Domain/InvoiceData.cs b/BTCPayServer.Plugins.Branta/Data/Domain/InvoiceData.cs
index 62943c5..f6f42f2 100644
--- a/BTCPayServer.Plugins.Branta/Data/Domain/InvoiceData.cs
+++ b/BTCPayServer.Plugins.Branta/Data/Domain/InvoiceData.cs
@@ -1,4 +1,4 @@
-using BTCPayServer.Plugins.Branta.Classes;
+using Branta.Enums;
 using BTCPayServer.Plugins.Branta.Enums;
 using BTCPayServer.Plugins.Branta.Models;
 using System;
@@ -21,7 +21,7 @@ public class InvoiceData
 
     public int ProcessingTime { get; set; }
 
-    public ServerEnvironment Environment { get; set; }
+    public BrantaServerBaseUrl Environment { get; set; }
 
     public InvoiceDataStatus Status { get; set; }
 
@@ -45,6 +45,6 @@ public string GetVerifyLink()
         var path = ZeroKnowledgeSecret != null ? "zk-verify" : "verify";
         var secret = ZeroKnowledgeSecret != null ? $"#secret={ZeroKnowledgeSecret}" : "";
 
-        return $"{baseUrl}/{BrantaClient.PaymentVersion}/{path}/{Uri.EscapeDataString(PaymentId)}{secret}";
+        return $"{baseUrl}/v2/{path}/{Uri.EscapeDataString(PaymentId)}{secret}";
     }
 }
diff --git a/BTCPayServer.Plugins.Branta/Enums/ServerEnvironment.cs b/BTCPayServer.Plugins.Branta/Enums/ServerEnvironment.cs
deleted file mode 100644
index 21dcf49..0000000
--- a/BTCPayServer.Plugins.Branta/Enums/ServerEnvironment.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace BTCPayServer.Plugins.Branta.Enums;
-
-public enum ServerEnvironment
-{
-    Staging = 0,
-    Production = 1
-}
diff --git a/BTCPayServer.Plugins.Branta/Models/BrantaSettingsViewModel.cs b/BTCPayServer.Plugins.Branta/Models/BrantaSettingsViewModel.cs
index c631acc..a43b970 100644
--- a/BTCPayServer.Plugins.Branta/Models/BrantaSettingsViewModel.cs
+++ b/BTCPayServer.Plugins.Branta/Models/BrantaSettingsViewModel.cs
@@ -1,5 +1,6 @@
-using BTCPayServer.Plugins.Branta.Classes;
-using BTCPayServer.Plugins.Branta.Enums;
+using Branta.Enums;
+using Branta.Extensions;
+using BTCPayServer.Plugins.Branta.Classes;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 
@@ -43,23 +44,23 @@ public string GetAPIKey()
         return StagingEnabled ? StagingApiKey : ProductionApiKey;
     }
 
-    public string GetBrantaServerUrl()
+    public BrantaServerBaseUrl GetBrantaServerUrl()
     {
-        return GetBrantaServerUrl(StagingEnabled ? ServerEnvironment.Staging : ServerEnvironment.Production);
+        if (Debugger.IsAttached)
+        {
+            return BrantaServerBaseUrl.Localhost;
+        }
+
+        return StagingEnabled ? BrantaServerBaseUrl.Staging : BrantaServerBaseUrl.Production;
     }
 
-    public static string GetBrantaServerUrl(ServerEnvironment environment)
+    public static string GetBrantaServerUrl(BrantaServerBaseUrl environment)
     {
         if (Debugger.IsAttached)
         {
-            return "http://localhost:3000";
+            return BrantaServerBaseUrl.Localhost.GetUrl();
         }
 
-        return environment switch
-        {
-            ServerEnvironment.Staging => "https://staging.branta.pro",
-            ServerEnvironment.Production => "https://guardrail.branta.pro",
-            _ => null
-        };
+        return environment.GetUrl();
     }
 }
diff --git a/BTCPayServer.Plugins.Branta/Services/BrantaService.cs b/BTCPayServer.Plugins.Branta/Services/BrantaService.cs
index 64a8fee..25d2d40 100644
--- a/BTCPayServer.Plugins.Branta/Services/BrantaService.cs
+++ b/BTCPayServer.Plugins.Branta/Services/BrantaService.cs
@@ -1,4 +1,9 @@
-using BTCPayServer.Models.InvoicingModels;
+using Branta.Classes;
+using Branta.Enums;
+using Branta.Exceptions;
+using Branta.V2.Classes;
+using Branta.V2.Models;
+using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Plugins.Branta.Classes;
 using BTCPayServer.Plugins.Branta.Interfaces;
@@ -101,7 +106,6 @@ private async Task<InvoiceData> CreateInvoiceAsync(InvoiceEntity btcPayInvoice,
         var chainBtcId = PaymentTypes.CHAIN.GetPaymentMethodId("BTC");
         var lnBtcId = PaymentTypes.LN.GetPaymentMethodId("BTC");
 
-        var secret = brantaSettings.EnableZeroKnowledge ? Guid.NewGuid().ToString() : null;
         var payments = btcPayInvoice
             .GetPaymentPrompts()
             .Where(pp => pp.Destination != null)
@@ -115,15 +119,10 @@ private async Task<InvoiceData> CreateInvoiceAsync(InvoiceEntity btcPayInvoice,
 
                 return 3;
             })
-            .Select(pp =>
+            .Select(pp => new Destination
             {
-                var isZk = brantaSettings.EnableZeroKnowledge && pp.PaymentMethodId == PaymentMethodId.TryParse("BTC");
-
-                return new Destination()
-                {
-                    Value = isZk ? Helper.Encrypt(pp.Destination, secret.ToString()) : pp.Destination,
-                    Zk = isZk
-                };
+                Value = pp.Destination,
+                IsZk = brantaSettings.EnableZeroKnowledge && pp.PaymentMethodId == PaymentMethodId.TryParse("BTC")
             })
             .ToList();
 
@@ -135,9 +134,8 @@ private async Task<InvoiceData> CreateInvoiceAsync(InvoiceEntity btcPayInvoice,
                 .OrderBy(p => p.Value.Length)
                 .First()
                 .Value,
-            Environment = brantaSettings.StagingEnabled ? Enums.ServerEnvironment.Staging : Enums.ServerEnvironment.Production,
+            Environment = brantaSettings.StagingEnabled ? BrantaServerBaseUrl.Staging : BrantaServerBaseUrl.Production,
             StoreId = btcPayInvoice.StoreId,
-            ZeroKnowledgeSecret = secret,
             PluginVersion = Helper.GetVersion()
         };
 
@@ -153,18 +151,33 @@ private async Task<InvoiceData> CreateInvoiceAsync(InvoiceEntity btcPayInvoice,
 
         try
         {
-            var ttl = (btcPayInvoice.ExpirationTime.AddMinutes(brantaSettings.TTL) - btcPayInvoice.InvoiceTime).TotalSeconds;
+            var ttl = (int)(btcPayInvoice.ExpirationTime.AddMinutes(brantaSettings.TTL) - btcPayInvoice.InvoiceTime).TotalSeconds;
             invoiceData.ExpirationDate = now.AddSeconds(ttl);
 
-            var paymentRequest = new Classes.PaymentRequest()
+            var paymentRequest = new Payment()
             {
                 Destinations = payments,
                 Description = brantaSettings.PostDescriptionEnabled ? GetDescription(btcPayInvoice) : null,
-                Ttl = ttl.ToString(),
+                TTL = ttl,
                 BtcPayServerPluginVersion = Helper.GetVersion()
             };
 
-            await brantaClient.PostPaymentAsync(paymentRequest, brantaSettings);
+            var options = new BrantaClientOptions()
+            {
+                BaseUrl = brantaSettings.GetBrantaServerUrl(),
+                DefaultApiKey = brantaSettings.GetAPIKey()
+            };
+
+            if (brantaSettings.EnableZeroKnowledge == true)
+            {
+                var (result, secret) = await brantaClient.AddZKPaymentAsync(paymentRequest, options);
+                invoiceData.ZeroKnowledgeSecret = secret;
+                invoiceData.PaymentId = result.Destinations.FirstOrDefault()?.Value;
+            }
+            else
+            {
+                await brantaClient.AddPaymentAsync(paymentRequest, options);
+            }
 
             invoiceData.Status = Enums.InvoiceDataStatus.Success;
         }
diff --git a/BTCPayServer.Plugins.Branta/Views/UIBranta/EditBranta.cshtml b/BTCPayServer.Plugins.Branta/Views/UIBranta/EditBranta.cshtml
index 1f4a9b9..521e045 100644
--- a/BTCPayServer.Plugins.Branta/Views/UIBranta/EditBranta.cshtml
+++ b/BTCPayServer.Plugins.Branta/Views/UIBranta/EditBranta.cshtml
@@ -3,6 +3,7 @@
 @using BTCPayServer.Plugins.Branta.Enums
 @using BTCPayServer.Plugins.Branta.Models
 @using BTCPayServer.Plugins.Branta.Views
+@using Branta.Enums
 
 @model BTCPayServer.Plugins.Branta.Models.BrantaSettingsViewModel
 
@@ -123,7 +124,7 @@
                 </div>
             </div>
             <span asp-validation-for="Settings.ProductionApiKey" class="text-danger"></span>
-            <p class="text-secondary mt-2">Visit your Branta <a href="@BrantaSettings.GetBrantaServerUrl(ServerEnvironment.Production)/session/new" target="_blank">Dashboard</a> to create an API Key.</p>
+            <p class="text-secondary mt-2">Visit your Branta <a href="@BrantaSettings.GetBrantaServerUrl(BrantaServerBaseUrl.Production)/session/new" target="_blank">Dashboard</a> to create an API Key.</p>
         </div>
 
         <button class="accordion-button collapsed only-for-js ms-0 d-inline-block" type="button" data-bs-toggle="collapse" data-bs-target="#advanced-settings" aria-expanded="false" aria-controls="advanced-settings">
@@ -178,7 +179,7 @@
                         </div>
                     </div>
                     <span asp-validation-for="Settings.StagingApiKey" class="text-danger"></span>
-                    <p class="text-secondary mt-2">Visit your Branta <a href="@BrantaSettings.GetBrantaServerUrl(ServerEnvironment.Staging)/session/new" target="_blank">Staging Dashboard</a> to create an API Key.</p>
+                    <p class="text-secondary mt-2">Visit your Branta <a href="@BrantaSettings.GetBrantaServerUrl(BrantaServerBaseUrl.Staging)/session/new" target="_blank">Staging Dashboard</a> to create an API Key.</p>
                 </div>
             </div>