diff --git a/roles/netbird/README.md b/roles/netbird/README.md
index 763665b..26f67d4 100644
--- a/roles/netbird/README.md
+++ b/roles/netbird/README.md
@@ -10,6 +10,7 @@ Role Variables
 --------------
 - `netbird_setup_key`: The key that is used to automate the setup process.
 - `netbird_register`: A true/false defining whether or not register netbird.
+- `netbird_mgmt_url`: The management URL for the self-hosted instance. If not specified, defaults to the cloud-hosted instance (https://api.netbird.io:443).
 
 Dependencies
 ------------
diff --git a/roles/netbird/defaults/main.yml b/roles/netbird/defaults/main.yml
index 0c37aa2..b467fb1 100644
--- a/roles/netbird/defaults/main.yml
+++ b/roles/netbird/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 # defaults file for netbird
+netbird_mgmt_url: https://api.netbird.io:443
diff --git a/roles/netbird/tasks/main.yml b/roles/netbird/tasks/main.yml
index 0e102cb..0a9b6ee 100644
--- a/roles/netbird/tasks/main.yml
+++ b/roles/netbird/tasks/main.yml
@@ -2,7 +2,7 @@
 # tasks file for netbird
 - name: Check for Netbird Installation
   ansible.builtin.shell:
-    cmd: netbird --version
+    cmd: netbird version
   ignore_errors: true
   register: netbird_installed
 
@@ -20,5 +20,7 @@
 
 - name: Start Netbird
   become: true
-  ansible.builtin.shell: netbird up --setup-key="{{ netbird_setup_key }}"
-  when: netbird_register is true and 'NeedsLogin' in netbird_status.stdout
+  ansible.builtin.shell: netbird up --setup-key="{{ netbird_setup_key }}" --management-url="{{ netbird_mgmt_url }}"
+  when: 
+    - netbird_register is true
+    - "'NeedsLogin' in netbird_status.stdout or 'LoginFailed' in netbird_status.stdout"