diff --git a/roles/fai/tasks/isc-dhcp-server.yml b/roles/fai/tasks/isc-dhcp-server.yml
index 8d61d74..9099ac8 100644
--- a/roles/fai/tasks/isc-dhcp-server.yml
+++ b/roles/fai/tasks/isc-dhcp-server.yml
@@ -15,7 +15,6 @@
     mode: '0644'
     owner: root
     group: root
-    validate: dhcpd -t -cf %s
   notify: restart dhcpd
   tags:
     - dhcp_configure
@@ -31,6 +30,7 @@
   notify: restart dhcpd
   tags:
     - dhcp_defaults
+    - dhcp_configure
 
 - name: "Start and enable dhcp server"
   become: true
diff --git a/roles/fai/tasks/package_mgmt.yml b/roles/fai/tasks/package_mgmt.yml
index 5f50737..7c6deb1 100644
--- a/roles/fai/tasks/package_mgmt.yml
+++ b/roles/fai/tasks/package_mgmt.yml
@@ -11,7 +11,7 @@
   become: true
   ansible.builtin.apt_key:
     id: "B11EE3273F6B2DEB528C93DA2BF8D9FE074BCDE4"
-    url: "https://fai-project.org/download/2BF8D9FE074BCDE4.asc"
+    url: "https://fai-project.org/download/fai-project.gpg"
     state: present
   tags:
     - fai_repo_key_install