diff --git a/install_modules.sh b/install_modules.sh
index 1c5acc23e9..4fb7dd5fa6 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -4,7 +4,13 @@ MODULE_PATH=/etc/puppet/modules
 
 # Array of modules to be installed key:value is module:version.
 declare -A MODULES
-MODULES["kickstandproject-ntp"]="0.0.3"
+#NOTE: if we previously installed kickstandproject-ntp we nuke it here
+# since puppetlabs-ntp and kickstandproject-ntp install to the same dir
+if grep kickstandproject-ntp /etc/puppet/modules/ntp/Modulefile &> /dev/null; then
+  rm -Rf "/etc/puppet/modules/ntp"
+fi
+MODULES["puppetlabs-ntp"]="0.2.0"
+
 MODULES["openstackci-dashboard"]="0.0.6"
 
 # freenode #puppet 2012-09-25:
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 5a341ec1bd..f1fa72fca8 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -19,7 +19,7 @@ class openstack_project::template (
     rules6           => $iptables_rules6,
   }
 
-  class { 'ntp::server': }
+  class { 'ntp': }
 
   class { 'openstack_project::base':
     install_users => $install_users,