diff --git a/pipeline/outputs/http.md b/pipeline/outputs/http.md
index 379a77468..475e6e241 100644
--- a/pipeline/outputs/http.md
+++ b/pipeline/outputs/http.md
@@ -28,7 +28,7 @@ The plugin supports the following configuration parameters:
 | `http_method` | Specify POST vs PUT HTTP Method. | `POST` |
 | `header` | Add a HTTP header key/value pair. Multiple headers can be set. | _none_ |
 | `json_date_key` | Specify the name of the time key in the output record. To disable the time key, set the value to `false`. | `date` |
-| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `iso8601`, `java_sql_timestamp`. | `double` |
+| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `epoch_ms`, `iso8601`, `java_sql_timestamp`. | `double` |
 | `gelf_timestamp_key` | Specify the key to use for `timestamp` in `gelf` format. | _none_ |
 | `gelf_host_key` | Specify the key to use for the `host` in `gelf` format. | _none_ |
 | `gelf_short_message_key` | Specify the key to use as the `short` message in `gelf` format. | _none_ |
diff --git a/pipeline/outputs/s3.md b/pipeline/outputs/s3.md
index b4d8ec4dd..493c0b161 100644
--- a/pipeline/outputs/s3.md
+++ b/pipeline/outputs/s3.md
@@ -30,7 +30,7 @@ The [Prometheus success/retry/error metrics values](../../administration/monitor
 | `region`           | The AWS region of your S3 bucket. | `us-east-1` |
 | `bucket`           | S3 Bucket name                    | _none_ |
 | `json_date_key`    | Specify the time key name in the output record. To disable the time key, set the value to `false`. | `date` |
-| `json_date_format` | Specify the format of the date. Accepted values: `double`, `epoch`, `iso8601` (2018-05-30T09:39:52.000681Z), `_java_sql_timestamp_` (2018-05-30 09:39:52.000681). | `iso8601` |
+| `json_date_format` | Specify the format of the date. Accepted values: `double`, `epoch`, `epoch_ms`, `iso8601` (2018-05-30T09:39:52.000681Z), `_java_sql_timestamp_` (2018-05-30 09:39:52.000681). | `iso8601` |
 | `total_file_size`  | Specify file size in S3. Minimum size is `1M`. With `use_put_object On` the maximum size is `1G`. With multipart uploads, the maximum size is `50G`. | `100M` |
 | `upload_chunk_size` | The size of each part for multipart uploads. Max: 50M | 5,242,880 bytes  |
 | `upload_timeout`   | When this amount of time elapses, Fluent Bit uploads and creates a new file in S3. Set to `60m` to upload a new file every hour. | `10m`|
diff --git a/pipeline/outputs/standard-output.md b/pipeline/outputs/standard-output.md
index 4b773ae2c..f51cf3465 100644
--- a/pipeline/outputs/standard-output.md
+++ b/pipeline/outputs/standard-output.md
@@ -8,7 +8,7 @@ The _standard output_ plugin prints ingested data to standard output.
 | --- | ----------- | ------- |
 | `Format` | Specify the data format to be printed. Supported formats are `msgpack`, `json`, `json_lines` and `json_stream`. | `msgpack` |
 | `json_date_key`| Specify the name of the time key in the output record. To disable the time key set the value to `false`. | `date` |
-| `json_date_format` | Specify the format of the date. Supported formats are `double`, `epoch`, `iso8601` (for example, `2018-05-30T09:39:52.000681Z`) and `java_sql_timestamp` (for example, `2018-05-30 09:39:52.000681`). | `double` |
+| `json_date_format` | Specify the format of the date. Supported formats are `double`, `epoch`, `epoch_ms`, `iso8601` (for example, `2018-05-30T09:39:52.000681Z`) and `java_sql_timestamp` (for example, `2018-05-30 09:39:52.000681`). | `double` |
 | `workers` | The number of [workers](../../administration/multithreading.md#outputs) to perform flush operations for this output. | `1` |
 
 ### Command line
diff --git a/pipeline/outputs/tcp-and-tls.md b/pipeline/outputs/tcp-and-tls.md
index 2e13036a5..8a3f44f34 100644
--- a/pipeline/outputs/tcp-and-tls.md
+++ b/pipeline/outputs/tcp-and-tls.md
@@ -12,7 +12,7 @@ This plugin supports the following parameters:
 | `Port` | TCP Port of the target service. | `5170` |
 | `Format` | Specify the data format to be printed. Supported formats: `msgpack`, `json`, `json_lines`, `json_stream`. | `msgpack` |
 | `json_date_key`| Specify the name of the time key in the output record. To disable the time key, set the value to `false`. | `date` |
-| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `iso8601`, `java_sql_timestamp`. | `double` |
+| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `epoch_ms`, `iso8601`, `java_sql_timestamp`. | `double` |
 | `workers` | The number of [workers](../../administration/multithreading.md#outputs) to perform flush operations for this output. | `2` |
 
 ## TLS configuration parameters
diff --git a/pipeline/outputs/websocket.md b/pipeline/outputs/websocket.md
index 195d1c3ab..7be6bc72a 100644
--- a/pipeline/outputs/websocket.md
+++ b/pipeline/outputs/websocket.md
@@ -14,7 +14,7 @@ This plugin supports the following parameters:
 | `Header` | Add a HTTP header key/value pair. Multiple headers can be set.  | _none_ |
 | `Format` | Specify the data format to be used in the HTTP request body. Supported formats: `json`, `json_stream`, `json_lines`, `gelf`. | `msgpack` |
 | `json_date_key` | Specify the name of the date field in output. | `date` |
-| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `iso8601`, `java_sql_timestamp`. | `double` |
+| `json_date_format` | Specify the format of the date. Supported formats: `double`, `epoch`, `epoch_ms`, `iso8601`, `java_sql_timestamp`. | `double` |
 | `workers` | The number of [workers](../../administration/multithreading.md#outputs) to perform flush operations for this output. | `0` |
 
 ## Get started