diff --git a/modules/jenkins/manifests/cgroups.pp b/modules/jenkins/manifests/cgroups.pp
index e8573d33b7..ad1979de80 100644
--- a/modules/jenkins/manifests/cgroups.pp
+++ b/modules/jenkins/manifests/cgroups.pp
@@ -28,9 +28,9 @@ class jenkins::cgroups {
   }
 
   # Starting with Ubuntu Quantal (12.10) cgroup-bin dropped its upstart jobs.
-  if $::operatingsystem == 'Ubuntu' {
+  if $::osfamily == 'Debian' {
 
-    if $::operatingsystemrelease >= '12.10' {
+    if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= '12.10' {
 
       file { '/etc/init/cgconfig.conf':
         ensure  => present,
diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp
index 9279dc7947..8c79bc44cd 100644
--- a/modules/jenkins/manifests/jenkinsuser.pp
+++ b/modules/jenkins/manifests/jenkinsuser.pp
@@ -69,7 +69,7 @@ class jenkins::jenkinsuser(
   }
 
   #NOTE: not all distributions have default bash files in /etc/skel
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
 
     file { '/home/jenkins/.bashrc':
       ensure  => present,
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 7445eb78b9..99adda761b 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -289,7 +289,7 @@ class jenkins::slave(
   # Temporary for debugging glance launch problem
   # https://lists.launchpad.net/openstack/msg13381.html
   # NOTE(dprince): ubuntu only as RHEL6 doesn't have sysctl.d yet
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
 
     file { '/etc/sysctl.d/10-ptrace.conf':
       ensure => present,
diff --git a/modules/openstack_project/manifests/automatic_upgrades.pp b/modules/openstack_project/manifests/automatic_upgrades.pp
index 8b5b97a615..a898b11c67 100644
--- a/modules/openstack_project/manifests/automatic_upgrades.pp
+++ b/modules/openstack_project/manifests/automatic_upgrades.pp
@@ -3,7 +3,7 @@
 class openstack_project::automatic_upgrades (
 ) {
 
-  if $::operatingsystem == 'Ubuntu' {
+  if $::osfamily == 'Debian' {
     include unattended_upgrades
   }
 
diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index 6ff8fc9eb9..48806a3c1a 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -4,7 +4,7 @@ class openstack_project::base(
   $certname = $::fqdn,
   $install_users = true
 ) {
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
     include apt
   }
   include openstack_project::params
@@ -56,7 +56,7 @@ class openstack_project::base(
   }
 
   # Use upstream puppet and pin to version 2.7.*
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
     apt::source { 'puppetlabs':
       location   => 'http://apt.puppetlabs.com',
       repos      => 'main',
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index b2ba31f8f9..09953e5ab9 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -18,8 +18,8 @@ class openstack_project::server (
     sysadmin => $sysadmins,
   }
 
-  # Custom rsyslog config to disable /dev/xconsole noise on Ubuntu servers
-  if $::operatingsystem == 'Ubuntu' {
+  # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
+  if $::osfamily == 'Debian' {
     file { '/etc/rsyslog.d/50-default.conf':
       ensure  => present,
       owner   => 'root',
diff --git a/modules/openstack_project/manifests/tmpcleanup.pp b/modules/openstack_project/manifests/tmpcleanup.pp
index d28a7e0d7f..069d6fe96a 100644
--- a/modules/openstack_project/manifests/tmpcleanup.pp
+++ b/modules/openstack_project/manifests/tmpcleanup.pp
@@ -3,7 +3,7 @@
 class openstack_project::tmpcleanup (
 ) {
 
-  if $::operatingsystem == 'Ubuntu' {
+  if $::osfamily == 'Debian' {
     include tmpreaper
   }
 
diff --git a/modules/salt/manifests/init.pp b/modules/salt/manifests/init.pp
index 13523b642b..8bd180e313 100644
--- a/modules/salt/manifests/init.pp
+++ b/modules/salt/manifests/init.pp
@@ -4,7 +4,7 @@ class salt (
   $salt_master = $::fqdn
 ) {
 
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
     include apt
 
     # Wrap in ! defined checks to allow minion and master installs on the
diff --git a/modules/salt/manifests/master.pp b/modules/salt/manifests/master.pp
index c01c76fc66..15fae7178f 100644
--- a/modules/salt/manifests/master.pp
+++ b/modules/salt/manifests/master.pp
@@ -2,7 +2,7 @@
 #
 class salt::master {
 
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
     include apt
 
     # Wrap in ! defined checks to allow minion and master installs on the
diff --git a/modules/snmpd/manifests/init.pp b/modules/snmpd/manifests/init.pp
index e7f0c509d0..1ca6ef80d8 100644
--- a/modules/snmpd/manifests/init.pp
+++ b/modules/snmpd/manifests/init.pp
@@ -14,7 +14,7 @@ class snmpd {
     require    => File['/etc/snmp/snmpd.conf']
   }
 
-  if ($::operatingsystem == 'Ubuntu') {
+  if ($::osfamily == 'Debian') {
     # This file is only needed on machines pre-precise. There is a bug in
     # the previous init script versions which causes them to attempt
     # snmptrapd even if it's configured not to run, and then to report
diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 38b2b08c51..e3a3a3ed44 100644
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -16,7 +16,7 @@ class ssh {
       group   => 'root',
       mode    => '0444',
       source  => [
-        "puppet:///modules/ssh/sshd_config.${::operatingsystem}",
+        "puppet:///modules/ssh/sshd_config.${::osfamily}",
         'puppet:///modules/ssh/sshd_config',
       ],
       replace => true,