diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 31146e5086..3888c9acd8 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -208,11 +208,13 @@
   copy: src="{{ files }}/common/step-tickers" dest=/etc/ntp/step-tickers
   tags:
   - koji_builder
+  - ntp
 
 - name: ntp.conf
   copy: src="{{ roles }}/base/files/ntp/ntp.conf" dest=/etc/ntp.conf
   tags:
   - koji_builder
+  - ntp
 
 #
 # We want more loop devices on builders to allow more image creates
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index d99191a175..1a0c7152a6 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -20,6 +20,9 @@
 - name: put step-tickers in place
   action: copy src="{{ files }}/common/step-tickers" dest=/etc/ntp/step-tickers
   when: ansible_cmdline.ostree is not defined
+  tags:
+  - ntp
+  - config
 
 - name: enable the service
   action: service name=ntpd state=running enabled=true
diff --git a/tasks/sign_setup.yml b/tasks/sign_setup.yml
index 99a9d3bdb4..6e2c44fb0c 100644
--- a/tasks/sign_setup.yml
+++ b/tasks/sign_setup.yml
@@ -56,9 +56,15 @@
 
 - name: ntp steptickers
   copy: src="{{ files }}/common/step-tickers" dest=/etc/ntp/step-tickers
+  tags:
+  - ntp
 
 - name: ntp.conf
   copy: src="{{ roles }}/base/files/ntp/ntp.conf" dest=/etc/ntp.conf
+  tags:
+  - ntp
 
 - name: enable ntpd
   service: name=ntpd enabled=true state=started
+  tags:
+  - ntp