diff --git a/playbook/imt-server-update.yml b/playbook/imt-server-update.yml
index 19184e722d2ae51d37d1c23fc4e4fceeca17c51f..c602ef077b7fffcb12cd9ba0b30c8efee9cf2a7d 100644
--- a/playbook/imt-server-update.yml
+++ b/playbook/imt-server-update.yml
@@ -3,7 +3,6 @@
   connection: local
 
   roles:
-    - { role: package, package_name: ntp, package_state: latest }
+    - ntp
     - { role: package, package_name: re6st-node, package_state: latest }
     - { role: package, package_name: slapos-node, package_state: latest }
-
diff --git a/playbook/imt-server.yml b/playbook/imt-server.yml
index f2d8d4720be6a5c2e7670ad8a7012ba4ff0a70ed..37a4c0440064f6ff9bf311be401fa8ca84ebf7f1 100644
--- a/playbook/imt-server.yml
+++ b/playbook/imt-server.yml
@@ -19,5 +19,4 @@
   roles:
     - { role: imt-slapos, mount_directory: /virt }
     - { role: slapos, package_state: present }
-    - { role: package, package_name: ntp, package_state: present }
     - { role: imt-slapos, post_config: True }
diff --git a/playbook/roles/ntp/meta/main.yml b/playbook/roles/ntp/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..17a242839322409a7d02f20a63ff78170634f057
--- /dev/null
+++ b/playbook/roles/ntp/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: package, package_name: ntp, package_state: present }
diff --git a/playbook/roles/ntp/tasks/main.yml b/playbook/roles/ntp/tasks/main.yml
index 971aae2cec3b8ad6f821aeb2d3b49cfae916cea3..98b4c7e6c2ba1f65b968ff552908049bf499b9be 100644
--- a/playbook/roles/ntp/tasks/main.yml
+++ b/playbook/roles/ntp/tasks/main.yml
@@ -1,11 +1,4 @@
 ---
-  - name: Install ntp
-    apt: name=ntp state=latest update_cache=yes cache_valid_time=86400
-    when: ansible_os_family == "Debian"
-
-  - include: ../../yum/tasks/main.yml name=ntp cache_valid_time=86400
-    when: ansible_os_family == "RedHat"
-
   - name: ensure ntp is runing
     service: name=ntp state=started enabled=yes
     when: ansible_os_family == "Debian"
diff --git a/playbook/roles/slapos/meta/main.yml b/playbook/roles/slapos/meta/main.yml
index 4c651fdc064e99756df8dea6bc24ca054db623ff..25454c5fdb3f738403b644dd648e5704b740dd8f 100644
--- a/playbook/roles/slapos/meta/main.yml
+++ b/playbook/roles/slapos/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  - { role: repository } 
+  - { role: ntp }
diff --git a/playbook/slapos-test-node.yml b/playbook/slapos-test-node.yml
index 4a884f888dbbccebc309bebd4e95ce4b94fcdaa3..4db99908c63ddfaa241bcafb39019b51309388d9 100644
--- a/playbook/slapos-test-node.yml
+++ b/playbook/slapos-test-node.yml
@@ -23,5 +23,4 @@
 
   roles:
     - { role: slapos, package_state: present } 
-    - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key
diff --git a/playbook/slapos.yml b/playbook/slapos.yml
index cf107a50e8d51ba4e60afc25168bbeffb187ac61..e21245a1aac48a55b82a735c130b6b0e3c131cbf 100644
--- a/playbook/slapos.yml
+++ b/playbook/slapos.yml
@@ -28,6 +28,5 @@
 
   roles:
     - { role: slapos, package_state: present }
-    - { role: package, package_name: ntp, package_state: present }
 
 
diff --git a/playbook/vifib-base.yml b/playbook/vifib-base.yml
index d108cd4f7e31f955d9b49112bb02a084b414542b..8e90474fb7b6335ff6edd3bd686f2b880ade30c5 100644
--- a/playbook/vifib-base.yml
+++ b/playbook/vifib-base.yml
@@ -15,7 +15,6 @@
   roles:
     - { role: re6stnet-install }
     - { role: slapos, package_state: present } 
-    - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key
     - upgrader
     - vifib-server
diff --git a/playbook/vifib-without-re6stnet.yml b/playbook/vifib-without-re6stnet.yml
index cc17ca0afa8e3c3ee3217cfd8c1fb79d039c10e4..1c2e1cf799338e920ac366721a7e8eed3c5be2a0 100644
--- a/playbook/vifib-without-re6stnet.yml
+++ b/playbook/vifib-without-re6stnet.yml
@@ -23,7 +23,6 @@
 
   roles:
     - { role: slapos, package_state: present }
-    - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key
     - upgrader
     - vifib-server
diff --git a/playbook/vifib.yml b/playbook/vifib.yml
index dc466e318377e5a0e96c8a61415a93bc65952bec..2dcf3bc4955c64473c11c49c863ec400c191374e 100644
--- a/playbook/vifib.yml
+++ b/playbook/vifib.yml
@@ -24,7 +24,6 @@
   roles:
     - { role: re6stnet-install, package_state: present }
     - { role: slapos, package_state: present } 
-    - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key
     - upgrader
     - vifib-server