diff --git a/Bitkit/Constants/Env.swift b/Bitkit/Constants/Env.swift
index 4a2af9e4..4db91915 100644
--- a/Bitkit/Constants/Env.swift
+++ b/Bitkit/Constants/Env.swift
@@ -183,18 +183,21 @@ enum Env {
 
     static var blocktankBaseUrl: String {
         switch network {
-        case .bitcoin: "https://api1.blocktank.to/api"
-        default: "https://api.stag0.blocktank.to/"
+        case .bitcoin: "https://api1.blocktank.to"
+        default: "https://api.stag0.blocktank.to"
         }
     }
 
     static var blocktankPushNotificationServer: String {
-        "\(blocktankBaseUrl)/notifications/api"
+        switch network {
+        case .bitcoin: "\(blocktankBaseUrl)/api/notifications"
+        default: "\(blocktankBaseUrl)/notifications/api"
+        }
     }
 
     static var blocktankClientServer: String {
         switch network {
-        case .bitcoin: "\(blocktankBaseUrl)"
+        case .bitcoin: "\(blocktankBaseUrl)/api"
         default: "\(blocktankBaseUrl)/blocktank/api/v2"
         }
     }
diff --git a/Bitkit/Services/CoreService.swift b/Bitkit/Services/CoreService.swift
index c584ef61..1f493233 100644
--- a/Bitkit/Services/CoreService.swift
+++ b/Bitkit/Services/CoreService.swift
@@ -1774,7 +1774,7 @@ class CoreService {
         } completion: { result in
             switch result {
             case .success():
-                Logger.info("Blocktank URL updated to \(Env.blocktankBaseUrl)", context: "CoreService")
+                Logger.info("Blocktank URL updated to \(Env.blocktankClientServer)", context: "CoreService")
             case let .failure(error):
                 Logger.error("Failed to update Blocktank URL: \(error)", context: "CoreService")
             }
diff --git a/Bitkit/Views/Settings/BlocktankRegtestView.swift b/Bitkit/Views/Settings/BlocktankRegtestView.swift
index 22f0fb2e..53176c33 100644
--- a/Bitkit/Views/Settings/BlocktankRegtestView.swift
+++ b/Bitkit/Views/Settings/BlocktankRegtestView.swift
@@ -68,7 +68,7 @@ struct BlocktankRegtestView: View {
 
     var serverInfoSection: some View {
         Section {
-            Text(Env.blocktankBaseUrl)
+            Text(Env.blocktankClientServer)
         } footer: {
             Text("These actions are executed on the staging Blocktank server node.")
         }