diff --git a/handlers/main.yml b/handlers/main.yml
index 24b1838..4af3106 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -5,7 +5,7 @@
     update_cache: true
 
 - name: Restart systemd-journald
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     name: systemd-journald
     state: restarted
 
diff --git a/tasks/set-hostname.yml b/tasks/set-hostname.yml
index dbed882..9dd0328 100644
--- a/tasks/set-hostname.yml
+++ b/tasks/set-hostname.yml
@@ -19,3 +19,4 @@
     state: present
   vars:
     ansible_remote_tmp: /tmp # Prevent warnings for auto-created tmp dir
+  when: "'activedirectory' not in group_names"