diff --git a/app/controllers/fluentd/settings/out_s3_controller.rb b/app/controllers/fluentd/settings/out_s3_controller.rb
index b90240a..04938a8 100644
--- a/app/controllers/fluentd/settings/out_s3_controller.rb
+++ b/app/controllers/fluentd/settings/out_s3_controller.rb
@@ -5,7 +5,9 @@ class Fluentd::Settings::OutS3Controller < ApplicationController
   def show
     @setting = Fluentd::Setting::OutS3.new({
       s3_endpoint: "s3-us-west-1.amazonaws.com",
-      buffer_path: "/var/log/fluent/s3",
+      output_tag: true,
+      output_time: true,
+      use_ssl: true,
     })
   end
 
diff --git a/app/models/fluentd/setting/out_s3.rb b/app/models/fluentd/setting/out_s3.rb
index b9f0a2b..a65b439 100644
--- a/app/models/fluentd/setting/out_s3.rb
+++ b/app/models/fluentd/setting/out_s3.rb
@@ -8,9 +8,9 @@ class Fluentd
         :match,
         :aws_key_id, :aws_sec_key, :s3_bucket, :s3_endpoint, :path,
         # :reduced_redundancy, :check_apikey_on_start, :command_parameter, # not configurable?
-        :format, :include_time_key, :time_key, :delimiter, :label_delimiter, :add_newline,
+        :format, :include_time_key, :time_key, :delimiter, :label_delimiter, :add_newline, :output_tag, :output_time,
         :time_slice_format, :time_slice_wait, :time_format, :utc, :store_as, :proxy_uri, :use_ssl,
-        :buffer_type, :buffer_path, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
+        :buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
         :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
       ].freeze
 
@@ -18,7 +18,8 @@ class Fluentd
 
       choice :format, %w(out_file json ltsv single_value)
       choice :store_as, %w(gzip lzo lzma2 json txt)
-      booleans :include_time_key, :add_newline, :use_ssl
+      choice :buffer_type, %w(memory file)
+      booleans :include_time_key, :add_newline, :use_ssl, :output_tag, :output_time
       flags :utc
 
       validates :match, presence: true
diff --git a/app/views/fluentd/settings/out_s3/_form.html.haml b/app/views/fluentd/settings/out_s3/_form.html.haml
index a4f2698..1678bb2 100644
--- a/app/views/fluentd/settings/out_s3/_form.html.haml
+++ b/app/views/fluentd/settings/out_s3/_form.html.haml
@@ -4,27 +4,29 @@
   = field(f, :match)
   = field(f, :aws_key_id)
   = field(f, :aws_sec_key)
-  = field(f, :s3_bucket)
   = field(f, :s3_endpoint)
-  = field(f, :path)
-  = field(f, :format, prompt: "--")
-  = field(f, :time_slice_format)
-  = field(f, :time_slice_wait)
-  = field(f, :include_time_key)
-  = field(f, :utc)
-  = field(f, :delimiter)
-  = field(f, :label_delimiter)
-  = field(f, :store_as)
-  = field(f, :proxy_uri)
+  = field(f, :s3_bucket)
   = field(f, :use_ssl)
+  = field(f, :path)
 
   .well.well-sm
     %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
       = icon('fa-caret-down')
       = t('terms.advanced_setting')
     #advanced-setting.collapse
+      = field(f, :format)
+      = field(f, :output_tag)
+      = field(f, :output_time)
+      = field(f, :include_time_key)
+      = field(f, :time_key)
+      = field(f, :delimiter)
+      = field(f, :label_delimiter)
+      = field(f, :utc)
+      = field(f, :time_slice_format)
+      = field(f, :time_slice_wait)
+      = field(f, :store_as)
+      = field(f, :proxy_uri)
       = field(f, :buffer_type)
-      = field(f, :buffer_path)
       = field(f, :buffer_queue_limit)
       = field(f, :buffer_chunk_limit)
       = field(f, :flush_interval)