diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..bb53136
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
\ No newline at end of file
diff --git a/Puppetfile b/Puppetfile
index e72a44e..d232be6 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,5 +1,6 @@
 forge 'forge.puppetlabs.com'
 
 # Forge Modules
-mod 'puppetlabs/ntp', '4.1.0'
+mod 'puppet-chrony', '3.0.0'
 mod 'puppetlabs/stdlib'
+mod 'puppet-systemd', '8.1.0'
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 24a0cce..6244573 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -1,9 +1,3 @@
 ---
 classes:
  - 'profile::base'
-
-ntp::servers:
-  - ptbtime1.ptb.de
-  - ptbtime2.ptb.de
-  - ptbtime3.ptb.de
-  - ptbtime4.ptb.de
diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp
index cc96345..ab0ea68 100644
--- a/site/profile/manifests/base.pp
+++ b/site/profile/manifests/base.pp
@@ -1,3 +1,10 @@
 class profile::base {
-  class { '::ntp': }
+  class { '::chrony':
+    servers => {
+      "ptbtime1.ptb.de"=>["iburst"],
+      "ptbtime2.ptb.de"=>["iburst"],
+      "ptbtime3.ptb.de"=>["iburst"],
+      "ptbtime4.ptb.de"=>["iburst"],
+    },
+  }
 }