diff --git a/manifests/auth.pp b/manifests/auth.pp
index 81111c8188a87b82bb9e545185c3f045f31bd3f5..0d746c4c19b20f7982edf326905b08ebdd5c0dfe 100644
--- a/manifests/auth.pp
+++ b/manifests/auth.pp
@@ -29,16 +29,17 @@ class aes::auth (
   # Pick the right keytab for the current environment. We use the fqdn rather than 
   # $environment since the keys are tied to the domain name rather than what 
   # environment the machine is configured in.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     # The AD service account for this key is: ida_sys002_srv
     $auth_keytab_data = $keytab_production
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     # The AD service account for this key is: ida_sys004_srv
     $auth_keytab_data = $keytab_devel
     $server_type = 'devel'
   } else {
     $auth_keytab_data = undef
+    $server_type = 'devel'
   }
 
   # Note: We rely on Boost being installed by the broker. It seems Puppet does not like
diff --git a/manifests/auth_keydb.pp b/manifests/auth_keydb.pp
index 238a7b3d23ee17bd10ba6711d5a9e8df17b28d47..f71e86bae746707e824d4792cf5de839bca693f3 100644
--- a/manifests/auth_keydb.pp
+++ b/manifests/auth_keydb.pp
@@ -12,9 +12,9 @@ class aes::auth_keydb {
   $keydb_service = 'aes_auth_keydb'
 
   # Figure out which certificate to use based on the hostname.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     $server_type = 'devel'
   } else {
     $server_type = undef
diff --git a/manifests/broker.pp b/manifests/broker.pp
index 0bdad4ad761b0f4a43f6a7f0c0626a2dcd1d63fc..880145bee2ec6894b8d4fb03c7ffd455de25bffb 100644
--- a/manifests/broker.pp
+++ b/manifests/broker.pp
@@ -22,9 +22,9 @@ class aes::broker {
   }
 
   # Figure out which certificate to use based on the hostname.
-  if $facts[fqdn] == 'aes.edu.liu.se' {
+  if $facts[networking][fqdn] == 'aes.edu.liu.se' {
     $server_type = 'production'
-  } elsif $facts[fqdn] == 'aes-devel.edu.liu.se' {
+  } elsif $facts[networking][fqdn] == 'aes-devel.edu.liu.se' {
     $server_type = 'devel'
   } else {
     $server_type = undef