diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index 4c97a16..9812cee 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -69,7 +69,7 @@ class HomeAssistant {
         _fetchCompleter.complete();
         MobileAppIntegrationManager.checkAppRegistration();
       } else {
-        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.homemade.systems/docs#mobile-app-integration")]));
+        _fetchCompleter.completeError(HAError("Mobile app component not found", actions: [HAErrorAction.tryAgain(), HAErrorAction(type: HAErrorActionType.URL ,title: "Help",url: "http://ha-client.estevez.dev/docs#mobile-app-integration")]));
       }
     }).catchError((e) {
       _fetchCompleter.completeError(e);
diff --git a/lib/main.dart b/lib/main.dart
index 5d6dcae..7828587 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -217,7 +217,7 @@ class HAClientApp extends StatelessWidget {
           appBar: new AppBar(
             leading: IconButton(
                 icon: Icon(Icons.help),
-                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#authentication")
+                onPressed: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.estevez.dev/docs#authentication")
             ),
             title: new Text("Login with HA"),
             actions: <Widget>[
diff --git a/lib/managers/auth_manager.class.dart b/lib/managers/auth_manager.class.dart
index 6069fb7..0780578 100644
--- a/lib/managers/auth_manager.class.dart
+++ b/lib/managers/auth_manager.class.dart
@@ -14,7 +14,7 @@ class AuthManager {
     Completer completer = Completer();
     final flutterWebviewPlugin = new FlutterWebviewPlugin();
     flutterWebviewPlugin.onUrlChanged.listen((String url) {
-      if (url.startsWith("http://ha-client.homemade.systems/service/auth_callback.html")) {
+      if (url.startsWith("http://ha-client.estevez.dev/service/auth_callback.html")) {
         Logger.d("url=$url");
         String authCode = url.split("=")[1];
         Logger.d("authCode=$authCode");
@@ -23,7 +23,7 @@ class AuthManager {
           endPoint: "/auth/token",
           contentType: "application/x-www-form-urlencoded",
           includeAuthHeader: false,
-          data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.homemade.systems')}"
+          data: "grant_type=authorization_code&code=$authCode&client_id=${Uri.encodeComponent('http://ha-client.estevez.dev')}"
         ).then((response) {
           Logger.d("Got temp token");
           String tempToken = json.decode(response)['access_token'];
diff --git a/lib/managers/connection_manager.class.dart b/lib/managers/connection_manager.class.dart
index a78738b..ff53e7f 100644
--- a/lib/managers/connection_manager.class.dart
+++ b/lib/managers/connection_manager.class.dart
@@ -59,9 +59,9 @@ class ConnectionManager {
           _token = await storage.read(key: "hacl_llt");
           Logger.e("Long-lived token read successful");
           oauthUrl = "$httpWebHost/auth/authorize?client_id=${Uri.encodeComponent(
-              'http://ha-client.homemade.systems')}&redirect_uri=${Uri
+              'http://ha-client.estevez.dev')}&redirect_uri=${Uri
               .encodeComponent(
-              'http://ha-client.homemade.systems/service/auth_callback.html')}";
+              'http://ha-client.estevez.dev/service/auth_callback.html')}";
           settingsLoaded = true;
         } catch (e) {
           completer.completeError(HAError("Error reading login details", actions: [HAErrorAction.tryAgain(type: HAErrorActionType.FULL_RELOAD), HAErrorAction.loginAgain()]));
diff --git a/lib/pages/integration_settings.page.dart b/lib/pages/integration_settings.page.dart
index a65abee..42f95fb 100644
--- a/lib/pages/integration_settings.page.dart
+++ b/lib/pages/integration_settings.page.dart
@@ -118,7 +118,7 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
                 Text("Location tracking", style: TextStyle(fontSize: Sizes.largeFontSize-2)),
                 Container(height: Sizes.rowPadding,),
                 InkWell(
-                  onTap: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/docs#location-tracking"),
+                  onTap: () => Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.estevez.dev/docs#location-tracking"),
                   child: Text(
                     "Please read documentation!",
                     style: TextStyle(
diff --git a/lib/pages/main.page.dart b/lib/pages/main.page.dart
index e9d1a6b..343a074 100644
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@@ -440,7 +440,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         title: Text("Help"),
         onTap: () {
           Navigator.of(context).pop();
-          Launcher.launchURL("http://ha-client.homemade.systems/docs");
+          Launcher.launchURL("http://ha-client.estevez.dev/docs");
         },
       ),
       new ListTile(
@@ -456,10 +456,10 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURL("http://ha-client.homemade.systems/");
+                Launcher.launchURL("http://ha-client.estevez.dev/");
               },
               child: Text(
-                "ha-client.homemade.systems",
+                "ha-client.estevez.dev",
                 style: TextStyle(
                     color: Colors.blue,
                     decoration: TextDecoration.underline
@@ -472,7 +472,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/terms_and_conditions");
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.estevez.dev/terms_and_conditions");
               },
               child: Text(
                 "Terms and Conditions",
@@ -488,7 +488,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
             GestureDetector(
               onTap: () {
                 Navigator.of(context).pop();
-                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.homemade.systems/privacy_policy");
+                Launcher.launchURLInCustomTab(context: context, url: "http://ha-client.estevez.dev/privacy_policy");
               },
               child: Text(
                 "Privacy Policy",
diff --git a/lib/pages/whats_new.page.dart b/lib/pages/whats_new.page.dart
index c26d0ac..964cd11 100644
--- a/lib/pages/whats_new.page.dart
+++ b/lib/pages/whats_new.page.dart
@@ -24,7 +24,7 @@ class _WhatsNewPageState extends State<WhatsNewPage> {
       error = "";
     });
     http.Response response;
-    response = await http.get("http://ha-client.homemade.systems/service/whats_new_0.7.0.md");
+    response = await http.get("http://ha-client.estevez.dev/service/whats_new_0.7.0.md");
     if (response.statusCode == 200) {
       setState(() {
         data = response.body;