diff --git a/roles/debian-base/tasks/main.yml b/roles/debian-base/tasks/main.yml
index bbdc17a..dcd5f94 100644
--- a/roles/debian-base/tasks/main.yml
+++ b/roles/debian-base/tasks/main.yml
@@ -32,5 +32,3 @@
   tags: bacula
 - import_tasks: vn-repo.yml
   tags: vn-repo
-- import_tasks: grub_startup.yml
-  tags: grub_startup
diff --git a/roles/debian-base/tasks/timesync.yml b/roles/debian-base/tasks/timesync.yml
index 57974cf..57d45df 100644
--- a/roles/debian-base/tasks/timesync.yml
+++ b/roles/debian-base/tasks/timesync.yml
@@ -1,23 +1,28 @@
-- name: Ensure directory for timesyncd custom configuration exists
-  file:
-    path: /etc/systemd/timesyncd.conf.d/
-    state: directory
-    owner: root
-    group: root
-    mode: u=rwx,g=rx,o=rx
-- name: Configure NTP settings in /etc/systemd/timesyncd.conf.d/vn-ntp.conf
-  copy:
-    dest: /etc/systemd/timesyncd.conf.d/vn-ntp.conf
-    content: |
-      [Time]
-      NTP={{ time_server }}
-      FallbackNTP={{ time_server_spain }}
-    owner: root
-    group: root
-    mode: u=rw,g=r,o=r
-  notify: restart systemd-timesyncd
-- name: Ensure systemd-timesyncd service is enabled and started
-  service:
-    name: systemd-timesyncd
-    enabled: yes
-    state: started
+- name: Getting service facts to check for timesyncd
+  service_facts:
+- when: "'systemd-timesyncd.service' in ansible_facts.services"
+  block:
+  - name: Ensure directory for timesyncd custom configuration exists
+    file:
+      path: /etc/systemd/timesyncd.conf.d/
+      state: directory
+      owner: root
+      group: root
+      mode: u=rwx,g=rx,o=rx
+  - name: Configure timesyncd service
+    copy:
+      dest: /etc/systemd/timesyncd.conf.d/vn-ntp.conf
+      content: |
+        [Time]
+        NTP={{ time_server }}
+        FallbackNTP={{ time_server_spain }}
+      owner: root
+      group: root
+      mode: u=rw,g=r,o=r
+    notify: restart systemd-timesyncd
+  - name: Ensure timesyncd service is enabled and started
+    when: "ansible_facts.services['systemd-timesyncd.service'].status == 'enabled'"
+    service:
+      name: systemd-timesyncd
+      enabled: yes
+      state: started
diff --git a/roles/debian-base/tasks/grub_startup.yml b/roles/debian-qemu/tasks/grub_startup.yml
similarity index 100%
rename from roles/debian-base/tasks/grub_startup.yml
rename to roles/debian-qemu/tasks/grub_startup.yml
diff --git a/roles/debian-qemu/tasks/main.yml b/roles/debian-qemu/tasks/main.yml
index bcb11ce..1b49a8d 100644
--- a/roles/debian-qemu/tasks/main.yml
+++ b/roles/debian-qemu/tasks/main.yml
@@ -6,3 +6,5 @@
   tags: autofs
 - import_tasks: blacklist.yml
   tags: blacklist
+- import_tasks: grub_startup.yml
+  tags: grub_startup