diff --git a/FlagsmithClient.podspec b/FlagsmithClient.podspec
index f686345..144743a 100644
--- a/FlagsmithClient.podspec
+++ b/FlagsmithClient.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FlagsmithClient'
-  s.version          = '2.1.0'
+  s.version          = '3.0.0'
   s.summary          = 'iOS Client written in Swift for Flagsmith. Ship features with confidence using feature flags and remote config.'
   s.homepage         = 'https://github.com/Flagsmith/flagsmith-ios-client'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/FlagsmithClient/Classes/Flagsmith.swift b/FlagsmithClient/Classes/Flagsmith.swift
index fd294ee..59ffd2b 100644
--- a/FlagsmithClient/Classes/Flagsmith.swift
+++ b/FlagsmithClient/Classes/Flagsmith.swift
@@ -17,7 +17,7 @@ public class Flagsmith {
   
   /// Base URL
   ///
-  /// The default implementation uses: `https://api.flagsmith.com/api/v1`.
+  /// The default implementation uses: `https://edge.api.flagsmith.com/api/v1`.
   public var baseURL: URL {
     set { apiManager.baseURL = newValue }
     get { apiManager.baseURL }
diff --git a/FlagsmithClient/Classes/Internal/APIManager.swift b/FlagsmithClient/Classes/Internal/APIManager.swift
index 5d70b95..a47bafd 100644
--- a/FlagsmithClient/Classes/Internal/APIManager.swift
+++ b/FlagsmithClient/Classes/Internal/APIManager.swift
@@ -16,7 +16,7 @@ class APIManager {
   private let session: URLSession
   
   /// Base `URL` used for requests.
-  var baseURL = URL(string: "https://api.flagsmith.com/api/v1/")!
+  var baseURL = URL(string: "https://edge.api.flagsmith.com/api/v1/")!
   /// API Key unique to an organization.
   var apiKey: String?
   
diff --git a/FlagsmithClient/Tests/RouterTests.swift b/FlagsmithClient/Tests/RouterTests.swift
index fd799b3..fb16a71 100644
--- a/FlagsmithClient/Tests/RouterTests.swift
+++ b/FlagsmithClient/Tests/RouterTests.swift
@@ -10,7 +10,7 @@ import XCTest
 
 final class RouterTests: FlagsmithClientTestCase {
     
-    let baseUrl = URL(string: "https://api.flagsmith.com/api/v1")
+    let baseUrl = URL(string: "https://edge.api.flagsmith.com/api/v1")
     let apiKey = "E71DC632-82BA-4522-82F3-D39FB6DC90AC"
     
     func testGetFlagsRequest() throws {
@@ -18,7 +18,7 @@ final class RouterTests: FlagsmithClientTestCase {
         let route = Router.getFlags
         let request = try route.request(baseUrl: url, apiKey: apiKey)
         XCTAssertEqual(request.httpMethod, "GET")
-        XCTAssertEqual(request.url?.absoluteString, "https://api.flagsmith.com/api/v1/flags/")
+        XCTAssertEqual(request.url?.absoluteString, "https://edge.api.flagsmith.com/api/v1/flags/")
         XCTAssertTrue(request.allHTTPHeaderFields?.contains(where: { $0.key == "X-Environment-Key" }) ?? false)
         XCTAssertNil(request.httpBody)
     }
@@ -28,7 +28,7 @@ final class RouterTests: FlagsmithClientTestCase {
         let route = Router.getIdentity(identity: "6056BCBF")
         let request = try route.request(baseUrl: url, apiKey: apiKey)
         XCTAssertEqual(request.httpMethod, "GET")
-        XCTAssertEqual(request.url?.absoluteString, "https://api.flagsmith.com/api/v1/identities/?identifier=6056BCBF")
+        XCTAssertEqual(request.url?.absoluteString, "https://edge.api.flagsmith.com/api/v1/identities/?identifier=6056BCBF")
         XCTAssertTrue(request.allHTTPHeaderFields?.contains(where: { $0.key == "X-Environment-Key" }) ?? false)
         XCTAssertNil(request.httpBody)
     }
@@ -39,7 +39,7 @@ final class RouterTests: FlagsmithClientTestCase {
         let route = Router.postTrait(trait: trait, identity: "CFF8D9CA")
         let request = try route.request(baseUrl: url, apiKey: apiKey, using: encoder)
         XCTAssertEqual(request.httpMethod, "POST")
-        XCTAssertEqual(request.url?.absoluteString, "https://api.flagsmith.com/api/v1/traits/")
+        XCTAssertEqual(request.url?.absoluteString, "https://edge.api.flagsmith.com/api/v1/traits/")
         
         let json = """
         {
@@ -66,7 +66,7 @@ final class RouterTests: FlagsmithClientTestCase {
         let request = try route.request(baseUrl: url, apiKey: apiKey, using: encoder)
         
         XCTAssertEqual(request.httpMethod, "POST")
-        XCTAssertEqual(request.url?.absoluteString, "https://api.flagsmith.com/api/v1/analytics/flags/")
+        XCTAssertEqual(request.url?.absoluteString, "https://edge.api.flagsmith.com/api/v1/analytics/flags/")
         
         let json = """
         {