diff --git a/defaults/main.yml b/defaults/main.yml
index 9a81c9e..c6192b7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,6 +5,7 @@ Radarr_user_uid: 1006
 Radarr_group_gid: 1006
 Radarr_user_home: /opt/{{ Radarr_user_name }}
 Radarr_data_path: "{{ Radarr_user_home }}/data"
+Radarr_exe_url: 'http://radarr.servarr.com/v1/update/master/updatefile?os=linux&runtime=netcore&arch=x64'
 Radarr_service_reload_command: systemctl daemon-reload
 Radarr_service_file:
   src: Radarr.service.j2
@@ -12,4 +13,3 @@ Radarr_service_file:
 Radarr_mono_gpg_key: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 Radarr_dependencies:
   - mono-devel
-
diff --git a/tasks/main.yml b/tasks/main.yml
index a442b91..fdf5c77 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-  - include: "{{ ansible_os_family }}.yml"
+  - include_tasks: "{{ ansible_os_family }}.yml"
 
   - name: Ensure Radarr service group exists
     group:
@@ -32,12 +32,6 @@
 #Radarr_user_home: /var/lib/{{ Radarr_user_name }}
 #Radarr_data_path: "{{ Radarr_user_home }}/data"
 
-  - name: Get Radar exe url
-    shell: curl -s https://api.github.com/repos/Radarr/Radarr/releases | grep linux.tar.gz | grep browser_download_url | head -1 | cut -d \" -f 4
-    register: shell_output
-  - set_fact:
-      Radarr_exe_url : "{{ shell_output.stdout }}"
-
   - name: Ensure the Radarr is downloaded
     get_url:
       url: "{{ Radarr_exe_url }}"
diff --git a/templates/Radarr.service.j2 b/templates/Radarr.service.j2
index adf938e..95ffdf2 100644
--- a/templates/Radarr.service.j2
+++ b/templates/Radarr.service.j2
@@ -1,17 +1,15 @@
 [Unit]
-Description=Radarr Server
-After=network.target
+Description=Radarr Daemon
+After=syslog.target network.target
 
 [Service]
 User={{ Radarr_user_name }}
 Group={{ Radarr_group_name }}
-
 Type=simple
-ExecStart=/usr/bin/mono {{ Radarr_user_home }}/bin/Radarr/Radarr.exe --nobrowser -data {{ Radarr_data_path }}
+ExecStart={{ Radarr_user_home }}/bin/Radarr/Radarr -nobrowser -data={{ Radarr_data_path }}
 TimeoutStopSec=20
 KillMode=process
-Restart=always
-
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target