diff --git a/Cargo.lock b/Cargo.lock
index d736631135..18064dd3be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -533,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.14"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
+checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
 dependencies = [
  "atty",
  "bitflags",
@@ -550,9 +550,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.0.12"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd2078197a22f338bd4fbf7d6387eb6f0d6a3c69e6cbc09f5c93e97321fd92a"
+checksum = "5fd1122e63869df2cb309f449da1ad54a7c6dfeb7c7e6ccd8e0825d9eb93bb72"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -1883,7 +1883,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "clap 3.0.14",
+ "clap 3.1.1",
  "comfy-table",
  "compactor",
  "csv",
@@ -2164,7 +2164,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "chrono-english",
- "clap 3.0.14",
+ "clap 3.1.1",
  "criterion",
  "data_types",
  "futures",
@@ -2193,7 +2193,7 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "chrono",
- "clap 3.0.14",
+ "clap 3.1.1",
  "dotenv",
  "futures",
  "glob",
@@ -5497,7 +5497,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "chrono",
- "clap 3.0.14",
+ "clap 3.1.1",
  "futures",
  "observability_deps",
  "snafu",
@@ -5642,7 +5642,7 @@ dependencies = [
 name = "trogging"
 version = "0.1.0"
 dependencies = [
- "clap 3.0.14",
+ "clap 3.1.1",
  "logfmt",
  "observability_deps",
  "regex",
diff --git a/influxdb_iox/src/clap_blocks/write_buffer.rs b/influxdb_iox/src/clap_blocks/write_buffer.rs
index 9d46b62940..6e14b8e94c 100644
--- a/influxdb_iox/src/clap_blocks/write_buffer.rs
+++ b/influxdb_iox/src/clap_blocks/write_buffer.rs
@@ -40,7 +40,7 @@ pub struct WriteBufferConfig {
         env = "INFLUXDB_IOX_WRITE_BUFFER_CONNECTION_CONFIG",
         default_value = "",
         multiple_values = true,
-        use_delimiter = true
+        use_value_delimiter = true
     )]
     pub(crate) connection_config: Vec<String>,
 
diff --git a/influxdb_iox/tests/end_to_end_cases/management_cli.rs b/influxdb_iox/tests/end_to_end_cases/management_cli.rs
index d03b1b3a4c..45453a1857 100644
--- a/influxdb_iox/tests/end_to_end_cases/management_cli.rs
+++ b/influxdb_iox/tests/end_to_end_cases/management_cli.rs
@@ -484,7 +484,7 @@ async fn release_database() {
         .assert()
         .failure()
         .stderr(predicate::str::contains(
-            "Invalid value for '--uuid <UUID>'",
+            r#"Invalid value "foo" for '--uuid <UUID>'"#,
         ));
 
     // If an optional UUID is specified, release the database if the UUID does match
@@ -636,7 +636,9 @@ async fn claim_database() {
         .arg(addr)
         .assert()
         .failure()
-        .stderr(predicate::str::contains("Invalid value for '<UUID>'"));
+        .stderr(predicate::str::contains(
+            r#"Invalid value "foo" for '<UUID>'"#,
+        ));
 
     // Claiming a valid but unknown UUID is an error
     let unknown_uuid = Uuid::new_v4();
diff --git a/iox_data_generator/src/bin/create_database.rs b/iox_data_generator/src/bin/create_database.rs
index ca78ff4885..2a2f49cdb0 100644
--- a/iox_data_generator/src/bin/create_database.rs
+++ b/iox_data_generator/src/bin/create_database.rs
@@ -12,7 +12,7 @@
 
 use std::collections::HashMap;
 
-use clap::{App, Arg};
+use clap::{Arg, Command};
 use influxdb_iox_client::{
     management::generated_types::{
         lifecycle_rules, partition_template, DatabaseRules, LifecycleRules, PartitionTemplate,
@@ -37,7 +37,7 @@ Examples:
     create_database --grpc-bind 127.0.0.1:9000 myorg_mybucket
 "#;
 
-    let matches = App::new(help)
+    let matches = Command::new(help)
         .about("IOx Database creation script")
         .arg(
             Arg::new("DATABASE_NAME")
diff --git a/iox_data_generator/src/bin/iox_data_generator.rs b/iox_data_generator/src/bin/iox_data_generator.rs
index 0e3d1a626c..2afab0f735 100644
--- a/iox_data_generator/src/bin/iox_data_generator.rs
+++ b/iox_data_generator/src/bin/iox_data_generator.rs
@@ -12,7 +12,7 @@
 
 use chrono::prelude::*;
 use chrono_english::{parse_date_string, Dialect};
-use clap::{crate_authors, crate_version, App, Arg};
+use clap::{crate_authors, crate_version, Arg, Command};
 use iox_data_generator::{specification::DataSpec, write::PointsWriterBuilder};
 use std::fs::File;
 use std::io::{self, BufRead};
@@ -47,7 +47,7 @@ Logging:
 
 "#;
 
-    let matches = App::new(help)
+    let matches = Command::new(help)
         .version(crate_version!())
         .author(crate_authors!())
         .about("IOx data point generator")