diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8696673260ce49f31d49856d68f5eefe810eb5f..4a081e39570e9d322eb2d28fff13c81b5da4e045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+* User information to Ceph bucket metrics. (#106)
+
+### Changed
+
+* `docker/telegraf` updated to `1.18.3`. (#106)
+
 ## [1.18.2] - 2021-05-06
 
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index 18e313bd53cbd4e8b35000f37798b631cd5cb4a0..b9826174a25769bc025adc273ca7b129f9de8894 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM telegraf:1.18.2
+FROM telegraf:1.18.3
 
 RUN \
   apt-get --assume-yes update \
diff --git a/README.md b/README.md
index 60e931351969df2b28a2f59302769e3bfcafd29d..cb50b2656cb425b464acab5dd9aa08618e6c86b8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Added functionality:
 
 ## Versions
 
-* `docker/telegraf 1.18.2`
+* `docker/telegraf 1.18.3`
 
 ## Usage examples
 
diff --git a/scripts/telegraf-ceph-bucket-metrics b/scripts/telegraf-ceph-bucket-metrics
index 05c1d41b30ceb778200c68e48e56d62214a271b5..8848de8afc4691da22e4a90d71684ce05ce4dcc0 100755
--- a/scripts/telegraf-ceph-bucket-metrics
+++ b/scripts/telegraf-ceph-bucket-metrics
@@ -15,6 +15,11 @@ def _points():
         secret_key=arguments.rgw_secret_key,
         is_secure=False
     )
+    user_emails = {
+        user.user_id: user.email or 'N/A'
+        for user in rgw_connection.get_users()
+    }
+
     timestamp = telegraf.timestamp()
     for bucket in rgw_connection.get_buckets():
         yield telegraf.Point(
@@ -24,7 +29,11 @@ def _points():
                 'num_objects': bucket.usage.num_objects if bucket.usage else 0,
                 'size': bucket.usage.size if bucket.usage else 0
             },
-            tags={'name': bucket.name}
+            tags={
+                'name': bucket.name,
+                'user_id': bucket.owner,
+                'user_email': user_emails[bucket.owner]
+            }
         )