diff --git a/manifests/aes_sw.pp b/manifests/aes_sw.pp
index d907ca2f141cd5e5d6291e387c19a49e1dc3f613..e8c780cd127f3205ce7013a424c748b5e3e72de0 100644
--- a/manifests/aes_sw.pp
+++ b/manifests/aes_sw.pp
@@ -52,6 +52,7 @@ class aes::aes_sw {
   # todo: logrotate
   service { 'aes_login' :
     ensure => 'running',
+    enable => true,
   }
 
   file { '/etc/systemd/system/aes_ms.service':
@@ -89,6 +90,7 @@ class aes::aes_sw {
   # todo: logrotate
   service { 'aes_ms' :
     ensure => 'running',
+    enable => true,
   }
 
   exec { 'script-repo-updated':
diff --git a/manifests/auth.pp b/manifests/auth.pp
index be636f5463f919987366c10a1831a3ad83c82adb..564425af99a318a55dd8c1c8e9a65770a445daed 100644
--- a/manifests/auth.pp
+++ b/manifests/auth.pp
@@ -120,5 +120,6 @@ class aes::auth(
 
   service { $auth_service :
     ensure => 'running',
+    enable => true,
   }
 }
diff --git a/manifests/auth_keydb.pp b/manifests/auth_keydb.pp
index 72a808e05a22f7274e85e093d6d0148b9c4d3f2b..fef8c92d8b5a26006ee4661080cd53cbd473f42a 100644
--- a/manifests/auth_keydb.pp
+++ b/manifests/auth_keydb.pp
@@ -60,6 +60,7 @@ class aes::auth_keydb {
 
   service { $keydb_service :
     ensure => 'running',
+    enable => true,
   }
 
   # These are temporary until the AdmC database is up and running.
@@ -74,4 +75,5 @@ class aes::auth_keydb {
 
   service { 'aes_temp_userdb' :
     ensure => 'running',
-}}
\ No newline at end of file
+  }
+}
\ No newline at end of file
diff --git a/manifests/broker.pp b/manifests/broker.pp
index 973989b813a655e6c33de66116f2dd91ddd1fa10..d01596fdd15704125f4070315dd9c67bcd33d009 100644
--- a/manifests/broker.pp
+++ b/manifests/broker.pp
@@ -100,5 +100,6 @@ class aes::broker {
 
   service { $broker_service :
     ensure => 'running',
+    enable => true,
   }
 }
diff --git a/manifests/squid_filter.pp b/manifests/squid_filter.pp
index b94f736acb232ae81d92ebba2fc3bb54757d6ecb..bb4012356aa4c1fa4cfa9a4e1a13e1a9f8689e95 100644
--- a/manifests/squid_filter.pp
+++ b/manifests/squid_filter.pp
@@ -63,6 +63,7 @@ class aes::squid_filter {
   # todo: logrotate
   service { 'squid' :
     ensure => 'running',
+    enable => true,
   }
 
 }