diff --git a/Puppetfile b/Puppetfile
index 207bef249..70f7ada6d 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -128,15 +128,15 @@ mod 'zaqar',
 ## External modules
 mod 'kmod',
   :git => 'https://github.com/voxpupuli/puppet-kmod',
-  :ref => 'v4.1.0'
+  :ref => 'v5.0.0'
 
 mod 'apache',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache',
-  :ref => 'v13.0.0'
+  :ref => 'v13.1.0'
 
 mod 'apt',
   :git => 'https://github.com/puppetlabs/puppetlabs-apt',
-  :ref => 'v11.1.0'
+  :ref => 'v11.2.0'
 
 mod 'concat',
   :git => 'https://github.com/puppetlabs/puppetlabs-concat',
@@ -144,11 +144,11 @@ mod 'concat',
 
 mod 'firewall',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall',
-  :ref => 'v8.2.0'
+  :ref => 'v8.3.0'
 
 mod 'inifile',
   :git => 'https://github.com/puppetlabs/puppetlabs-inifile',
-  :ref => 'v6.2.0'
+  :ref => 'v6.3.1'
 
 mod 'mysql',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql',
@@ -156,11 +156,11 @@ mod 'mysql',
 
 mod 'postgresql',
   :git => 'https://github.com/puppetlabs/puppetlabs-postgresql',
-  :ref => 'v10.6.0'
+  :ref => 'v10.6.1'
 
 mod 'rabbitmq',
   :git => 'https://github.com/voxpupuli/puppet-rabbitmq',
-  :ref => 'v14.4.1'
+  :ref => 'v15.0.0'
 
 mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync',
@@ -180,11 +180,11 @@ mod 'xinetd',
 
 mod 'memcached',
   :git => 'https://github.com/saz/puppet-memcached',
-  :ref => 'v10.0.1'
+  :ref => 'v11.0.0'
 
 mod 'dns',
   :git => 'https://github.com/theforeman/puppet-dns',
-  :ref => '11.1.0'
+  :ref => '12.1.0'
 
 mod 'archive',
   :git => 'https://github.com/voxpupuli/puppet-archive',
@@ -196,9 +196,10 @@ mod 'ssh_keygen',
 
 mod 'redis',
   :git => 'https://github.com/voxpupuli/puppet-redis',
-  :ref => 'v12.0.0'
+  # NOTE(tkajinam): Temporal bump to fix broken idempotency
+  :ref => '27a95724b0a9597bbd9a314a96ff47da7eaaac18'
 
 mod 'systemd',
   :git => 'https://github.com/voxpupuli/puppet-systemd',
-  :ref => 'v9.1.0'
+  :ref => 'v9.4.0'
 
diff --git a/Puppetfile_unit b/Puppetfile_unit
index 64cda1079..48e2dff34 100644
--- a/Puppetfile_unit
+++ b/Puppetfile_unit
@@ -2,25 +2,25 @@
 
 mod 'augeas_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-augeas_core',
-  :ref => 'v1.5.0'
+  :ref => 'v2.0.1'
 
 mod 'cron_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-cron_core',
-  :ref => 'v1.3.0'
+  :ref => 'v2.0.2'
 
 mod 'sshkeys_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-sshkeys_core',
-  :ref => 'v2.5.1'
+  :ref => 'v3.0.1'
 
 mod 'yumrepo_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-yumrepo_core',
-  :ref => 'v2.1.0'
+  :ref => 'v3.0.1'
 
 mod 'mount_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-mount_core',
-  :ref => 'v1.3.0'
+  :ref => 'v2.0.1'
 
 mod 'selinux_core',
   :git => 'https://github.com/puppetlabs/puppetlabs-selinux_core',
-  :ref => 'v1.4.0'
+  :ref => 'v2.0.1'
 
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
index e5a2474f2..e4de7e872 100644
--- a/manifests/ssl_key.pp
+++ b/manifests/ssl_key.pp
@@ -26,13 +26,13 @@ define openstack_integration::ssl_key (
     file { "/etc/${name}/ssl":
       ensure                  => directory,
       owner                   => $key_owner,
-      mode                    => '0775',
+      mode                    => '0750',
       selinux_ignore_defaults => true,
     }
     file { "/etc/${name}/ssl/private":
       ensure                  => directory,
       owner                   => $key_owner,
-      mode                    => '0755',
+      mode                    => '0750',
       require                 => File["/etc/${name}/ssl"],
       selinux_ignore_defaults => true,
       before                  => File[$_key_path],
@@ -44,6 +44,6 @@ define openstack_integration::ssl_key (
     owner                   => $key_owner,
     source                  => "puppet:///modules/openstack_integration/ipv${openstack_integration::config::ip_version}.key",
     selinux_ignore_defaults => true,
-    mode                    => '0600',
+    mode                    => '0640',
   }
 }