diff --git a/data/Solaris-11.yaml b/data/Solaris-11.yaml
index 503160cf..979b1ce6 100644
--- a/data/Solaris-11.yaml
+++ b/data/Solaris-11.yaml
@@ -1,4 +1,11 @@
-ntp::package_name: [ 'SUNWntpr', 'SUNWntpu' ]
+ntp::config: '/etc/inet/ntp.conf'
+ntp::driftfile: '/var/ntp/ntp.drift'
+ntp::keys_file: '/etc/inet/ntp.keys'
+ntp::package_name: [ 'service/network/ntp' ]
 ntp::restrict:
-  - 'default nomodify notrap nopeer noquery'
+  - 'default kod nomodify notrap nopeer noquery'
+  - '-6 default kod nomodify notrap nopeer noquery'
   - '127.0.0.1'
+  - '-6 ::1'
+ntp::service_name: 'network/ntp'
+ntp::iburst_enable: false
diff --git a/data/Solaris.yaml b/data/Solaris.yaml
index 979b1ce6..2bec49f3 100644
--- a/data/Solaris.yaml
+++ b/data/Solaris.yaml
@@ -1,11 +1,9 @@
 ntp::config: '/etc/inet/ntp.conf'
 ntp::driftfile: '/var/ntp/ntp.drift'
 ntp::keys_file: '/etc/inet/ntp.keys'
-ntp::package_name: [ 'service/network/ntp' ]
+ntp::package_name: [ 'SUNWntpr', 'SUNWntpu' ]
 ntp::restrict:
-  - 'default kod nomodify notrap nopeer noquery'
-  - '-6 default kod nomodify notrap nopeer noquery'
+  - 'default nomodify notrap nopeer noquery'
   - '127.0.0.1'
-  - '-6 ::1'
 ntp::service_name: 'network/ntp'
 ntp::iburst_enable: false