diff --git a/libraries/resource_kibana.rb b/libraries/resource_kibana.rb
index b80f435..08f4971 100644
--- a/libraries/resource_kibana.rb
+++ b/libraries/resource_kibana.rb
@@ -21,13 +21,13 @@ class Kibana < Chef::Resource::LWRPBase
       attribute :kibana_elasticsearch_password, kind_of: String, default: nil
       attribute :kibana_elasticsearch_username, kind_of: String, default: nil
       attribute :kibana_index, kind_of: String, default: '.kibana'
-      attribute :log_file, kind_of: Integer, default: './kibana.log'
+      attribute :log_file, kind_of: Integer, default: nil
       attribute :path, kind_of: String, default: '/opt/kibana'
-      attribute :pid_file, kind_of: String, default: '/var/run/kibana.pid'
+      attribute :pid_file, kind_of: String, default: nil
       attribute :ping_timeout, kind_of: Integer, default: 1500
       attribute :port, kind_of: [String, Integer], default: 3000
       attribute :request_timeout, kind_of: Integer, default: 30_000
-      attribute :shard_timeout, kind_of: Integer, default: 0
+      attribute :shard_timeout, kind_of: Integer, default: 15
       attribute :source, kind_of: String, default: 'elk'
       attribute :ssl_cert_file, kind_of: String, default: nil
       attribute :ssl_key_file, kind_of: String, default: nil
diff --git a/templates/default/kibana/kibana.yml.erb b/templates/default/kibana/kibana.yml.erb
index 802915a..6f9f95d 100644
--- a/templates/default/kibana/kibana.yml.erb
+++ b/templates/default/kibana/kibana.yml.erb
@@ -42,7 +42,7 @@ default_app_id: <%= @options['default_app_id'] %>
 
 # Time in milliseconds to wait for responses from the back end or elasticsearch.
 # This must be > 0
-request_timeout: <%= @options['request_timeout'] %>
+<%= "request_timeout: #{ @options['request_timeout']}" if @options['request_timeout'] -%>
 
 # Time in milliseconds for Elasticsearch to wait for responses from shards.
 # Set to 0 to disable.
@@ -53,7 +53,7 @@ shard_timeout: <%= @options['shard_timeout'] %>
 
 # Set to false to have a complete disregard for the validity of the SSL
 # certificate.
-verify_ssl: <%= @options['verify_ssl'] %>
+<%= "verify_ssl: #{ @options['verify_ssl']}" if @options['verify_ssl'] -%>
 
 # SSL for outgoing requests from the Kibana Server (PEM formatted)
 <%= "ssl_key_file: #{ @options['ssl_key_file']}" if @options['ssl_key_file'] -%>