diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 065e56c..389b480 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ stages:
 ### BEGIN TEMPLATES ###
 .tags_template: &tags_template
   tags:
-    - zen-ci-workstation
+    - zen-ci
 
 
 .header_template: &header
diff --git a/tasks/main.yml b/tasks/main.yml
index 936268b..0348073 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,9 +6,16 @@
   when: ansible_distribution == "Debian"
 
 
+- name: set package and service for centos 8
+  set_fact:
+    ntp_pkg     : chrony
+    ntp_service : chronyd
+  when: ansible_distribution_major_version == "8"
+
+
 - name: install ntp if not present
   package:
-    name  : ntp
+    name  : "{{ ntp_pkg | default('ntp') }}"
     state : present
 
 
@@ -22,7 +29,7 @@
   notify: restart ntpd
 
 
-- name: enable/start ntpd
+- name: enable/start ntpd or chrony
   service:
     name: "{{ ntp_service }}"
     enabled: yes