diff --git a/data/common.yaml b/data/common.yaml
index 5de80e2..c9e9852 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -5,9 +5,12 @@ profile::base::resolv::nameservers:
   - '8.8.8.8'
   - '127.0.0.1'
 profile::base::resolv::domainname: home
+profile::base::selinux::mode: true
 profile::base::selinux::mode: permissive
 profile::base::time: true
 profile::base::time::ntp_servers:
   - 0.uk.pool.ntp.org
   - 1.uk.pool.ntp.org
   - 2.uk.pool.ntp.org
+profile::base::ssh: true
+profile::base::motd: true
diff --git a/data/nodes/puppet.home.yaml b/data/nodes/puppet.home.yaml
index 1c305fd..dabcf48 100644
--- a/data/nodes/puppet.home.yaml
+++ b/data/nodes/puppet.home.yaml
@@ -1,4 +1,3 @@
 ---
 profile::puppetserver::authority: true
-#profile::puppetserver::authority::jwt_secret: "koHc5pzVSVpJhijthem3zT8WXN8="
 profile::puppetserver::authority::validity: 7200
diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
index 6656b94..5256709 100644
--- a/site-modules/profile/manifests/base.pp
+++ b/site-modules/profile/manifests/base.pp
@@ -3,9 +3,9 @@ class profile::base (
   Boolean $time     = false,
   Boolean $repos    = false,
   Boolean $resolv   = false,
-  Boolean $ssh      = true,
-  Boolean $selinux  = true,
-  Boolean $motd     = true,
+  Boolean $ssh      = false,
+  Boolean $selinux  = false,
+  Boolean $motd     = false,
 ) {
   if $motd {
     class { '::motd': }