diff --git a/attributes/config.rb b/attributes/config.rb
index 28547ba..9439314 100644
--- a/attributes/config.rb
+++ b/attributes/config.rb
@@ -7,23 +7,23 @@
   api_url: 'http://127.0.0.1:9101',
   api_host: '0.0.0.0',
   api_port: 9101,
-  api_mask_secrets: True,
+  api_mask_secrets: true,
   api_allow_origin: '*',
 
   auth_host: '0.0.0.0',
   auth_port: 9100,
-  auth_use_ssl: False,
-  auth_debug: False,
-  auth_enable: True,
+  auth_use_ssl: false,
+  auth_debug: false,
+  auth_enable: true,
   auth_standalone_file: '/etc/st2/htpasswd',
 
-  syslog_enabled: False,
+  syslog_enabled: false,
   syslog_host: '127.0.0.1',
   syslog_port: 514,
   syslog_facility: 'local7',
   syslog_protocol: 'udp',
 
-  log_mask_secrets: True,
+  log_mask_secrets: true,
 
   system_user: node['stackstorm']['user']['user'],
   ssh_key_file: "#{node['stackstorm']['user']['home']}/.ssh/id_rsa",
diff --git a/attributes/web.rb b/attributes/web.rb
index 158028a..bae30ff 100644
--- a/attributes/web.rb
+++ b/attributes/web.rb
@@ -4,7 +4,7 @@
 #
 
 # Self-signed certificate
-default['stackstorm']['web']['ssl']['self_signed']['enabled'] = True
+default['stackstorm']['web']['ssl']['self_signed']['enabled'] = true
 default['stackstorm']['web']['ssl']['self_signed']['org'] = 'StackStorm'
 default['stackstorm']['web']['ssl']['self_signed']['org_unit'] = 'Information Technology'
 default['stackstorm']['web']['ssl']['self_signed']['country'] = 'US'
diff --git a/recipes/_services.rb b/recipes/_services.rb
index 0311cb0..57a421f 100644
--- a/recipes/_services.rb
+++ b/recipes/_services.rb
@@ -11,6 +11,7 @@
   st2actionrunner st2api st2stream
   st2auth st2garbagecollector st2notifier
   st2resultstracker st2rulesengine st2sensorcontainer
+  st2timersengine st2workflowengine
 ).freeze
 
 # Enable & Start st2 services
diff --git a/recipes/bundle.rb b/recipes/bundle.rb
index 06f0788..802fb1a 100644
--- a/recipes/bundle.rb
+++ b/recipes/bundle.rb
@@ -44,6 +44,7 @@
 node.default['mongodb']['package_version'] = '3.4.17'
 node.default['postgresql']['pg_gem']['version'] = '0.21.0'
 node.override['htpasswd']['install_method'] = 'ruby'
+node.override['rabbitmq']['use_distro_version'] = true
 
 include_recipe 'htpasswd::default'
 include_recipe 'sc-mongodb::default'
diff --git a/recipes/web.rb b/recipes/web.rb
index ca1079e..01c3a88 100644
--- a/recipes/web.rb
+++ b/recipes/web.rb
@@ -18,7 +18,7 @@
   org node['stackstorm']['web']['ssl']['self_signed']['org']
   org_unit node['stackstorm']['web']['ssl']['self_signed']['org_unit']
   country node['stackstorm']['web']['ssl']['self_signed']['country']
-  only_if { node['stackstorm']['web']['ssl']['self_signed']['enabled'] == True }
+  only_if { node['stackstorm']['web']['ssl']['self_signed']['enabled'] == true }
 end
 
 include_recipe 'chef_nginx::repo'
diff --git a/spec/recipes/config_spec.rb b/spec/recipes/config_spec.rb
index 216f944..4860447 100644
--- a/spec/recipes/config_spec.rb
+++ b/spec/recipes/config_spec.rb
@@ -160,23 +160,23 @@
               'api_url' => 'http://127.0.0.1:9101',
               'api_host' => '0.0.0.0',
               'api_port' => 9101,
-              'api_mask_secrets' => True,
+              'api_mask_secrets' => true,
               'api_allow_origin' => '*',
 
               'auth_host' => '0.0.0.0',
               'auth_port' => 9100,
-              'auth_use_ssl' => False,
-              'auth_debug' => False,
-              'auth_enable' => True,
+              'auth_use_ssl' => false,
+              'auth_debug' => false,
+              'auth_enable' => true,
               'auth_standalone_file' => '/etc/st2/htpasswd',
 
-              'syslog_enabled' => False,
+              'syslog_enabled' => false,
               'syslog_host' => '127.0.0.1',
               'syslog_port' => 514,
               'syslog_facility' => 'local7',
               'syslog_protocol' => 'udp',
 
-              'log_mask_secrets' => True,
+              'log_mask_secrets' => true,
 
               'system_user' => 'stanley',
               'ssh_key_file' => '/home/stanley/.ssh/id_rsa',
diff --git a/test/recipes/default/_services.rb b/test/recipes/default/_services.rb
index 30d217a..1ac7bbd 100644
--- a/test/recipes/default/_services.rb
+++ b/test/recipes/default/_services.rb
@@ -11,6 +11,7 @@
   st2actionrunner st2api st2stream
   st2auth st2garbagecollector st2notifier
   st2resultstracker st2rulesengine st2sensorcontainer
+  st2timersengine st2workflowengine
 ).freeze
 
 ST2_SERVICES.each do |service_name|