diff --git a/clap_blocks/src/catalog_dsn.rs b/clap_blocks/src/catalog_dsn.rs
index ad1d45f51f..c23882004e 100644
--- a/clap_blocks/src/catalog_dsn.rs
+++ b/clap_blocks/src/catalog_dsn.rs
@@ -49,7 +49,7 @@ pub struct CatalogDsnConfig {
     /// The type of catalog to use. "memory" is only useful for testing purposes.
     #[clap(
         value_enum,
-        long = "--catalog",
+        long = "catalog",
         env = "INFLUXDB_IOX_CATALOG_TYPE",
         default_value = "postgres",
         action
@@ -57,12 +57,12 @@ pub struct CatalogDsnConfig {
     pub(crate) catalog_type_: CatalogType,
 
     /// Postgres connection string. Required if catalog is set to postgres.
-    #[clap(long = "--catalog-dsn", env = "INFLUXDB_IOX_CATALOG_DSN", action)]
+    #[clap(long = "catalog-dsn", env = "INFLUXDB_IOX_CATALOG_DSN", action)]
     pub dsn: Option<String>,
 
     /// Maximum number of connections allowed to the catalog at any one time.
     #[clap(
-        long = "--catalog-max-connections",
+        long = "catalog-max-connections",
         env = "INFLUXDB_IOX_CATALOG_MAX_CONNECTIONS",
         default_value = default_max_connections(),
         action,
@@ -71,7 +71,7 @@ pub struct CatalogDsnConfig {
 
     /// Schema name for PostgreSQL-based catalogs.
     #[clap(
-        long = "--catalog-postgres-schema-name",
+        long = "catalog-postgres-schema-name",
         env = "INFLUXDB_IOX_CATALOG_POSTGRES_SCHEMA_NAME",
         default_value = PostgresConnectionOptions::DEFAULT_SCHEMA_NAME,
         action,
@@ -80,7 +80,7 @@ pub struct CatalogDsnConfig {
 
     /// Set the amount of time to attempt connecting to the database.
     #[clap(
-        long = "--catalog-connect-timeout",
+        long = "catalog-connect-timeout",
         env = "INFLUXDB_IOX_CATALOG_CONNECT_TIMEOUT",
         default_value = default_connect_timeout(),
         value_parser = humantime::parse_duration,
@@ -89,7 +89,7 @@ pub struct CatalogDsnConfig {
 
     /// Set a maximum idle duration for individual connections.
     #[clap(
-        long = "--catalog-idle-timeout",
+        long = "catalog-idle-timeout",
         env = "INFLUXDB_IOX_CATALOG_IDLE_TIMEOUT",
         default_value = default_idle_timeout(),
         value_parser = humantime::parse_duration,
@@ -101,7 +101,7 @@ pub struct CatalogDsnConfig {
     ///
     /// If an update is encountered, the underlying connection pool will be hot-swapped.
     #[clap(
-        long = "--catalog-hotswap-poll-interval",
+        long = "catalog-hotswap-poll-interval",
         env = "INFLUXDB_IOX_CATALOG_HOTSWAP_POLL_INTERVAL",
         default_value = default_hotswap_poll_interval_timeout(),
         value_parser = humantime::parse_duration,
diff --git a/clap_blocks/src/compactor.rs b/clap_blocks/src/compactor.rs
index 637d731575..990b4178bf 100644
--- a/clap_blocks/src/compactor.rs
+++ b/clap_blocks/src/compactor.rs
@@ -19,7 +19,7 @@ macro_rules! gen_compactor_config {
             /// Write buffer topic/database that the compactor will be compacting files for. It
             /// won't connect to Kafka, but uses this to get the shards out of the catalog.
             #[clap(
-                long = "--write-buffer-topic",
+                long = "write-buffer-topic",
                 env = "INFLUXDB_IOX_WRITE_BUFFER_TOPIC",
                 default_value = "iox-shared",
                 action
@@ -28,7 +28,7 @@ macro_rules! gen_compactor_config {
 
             /// Write buffer shard index to start (inclusive) range with
             #[clap(
-                long = "--shard-index-range-start",
+                long = "shard-index-range-start",
                 env = "INFLUXDB_IOX_SHARD_INDEX_RANGE_START",
                 action
             )]
@@ -36,7 +36,7 @@ macro_rules! gen_compactor_config {
 
             /// Write buffer shard index to end (inclusive) range with
             #[clap(
-                long = "--shard-index-range-end",
+                long = "shard-index-range-end",
                 env = "INFLUXDB_IOX_SHARD_INDEX_RANGE_END",
                 action
             )]
@@ -46,7 +46,7 @@ macro_rules! gen_compactor_config {
             /// It is a target desired value, rather than a guarantee.
             /// 1024 * 1024 * 25 =  26,214,400 (25MB)
             #[clap(
-                long = "--compaction-max-desired-size-bytes",
+                long = "compaction-max-desired-size-bytes",
                 env = "INFLUXDB_IOX_COMPACTION_MAX_DESIRED_FILE_SIZE_BYTES",
                 default_value = "26214400",
                 action
@@ -60,7 +60,7 @@ macro_rules! gen_compactor_config {
             /// This value must be between (0, 100)
             /// Default is 80
             #[clap(
-                long = "--compaction-percentage-max-file_size",
+                long = "compaction-percentage-max-file_size",
                 env = "INFLUXDB_IOX_COMPACTION_PERCENTAGE_MAX_FILE_SIZE",
                 default_value = "80",
                 action
@@ -77,7 +77,7 @@ macro_rules! gen_compactor_config {
             /// This value must be between (0, 100)
             /// Default is 80
             #[clap(
-                long = "--compaction-split-percentage",
+                long = "compaction-split-percentage",
                 env = "INFLUXDB_IOX_COMPACTION_SPLIT_PERCENTAGE",
                 default_value = "80",
                 action
@@ -87,7 +87,7 @@ macro_rules! gen_compactor_config {
             /// Max number of partitions per shard we want to compact per cycle
             /// Default: 1
             #[clap(
-                long = "--compaction-max-number-partitions-per-shard",
+                long = "compaction-max-number-partitions-per-shard",
                 env = "INFLUXDB_IOX_COMPACTION_MAX_NUMBER_PARTITIONS_PER_SHARD",
                 default_value = "1",
                 action
@@ -99,7 +99,7 @@ macro_rules! gen_compactor_config {
             ///
             /// Default: 1
             #[clap(
-                long = "--compaction-min-number-recent-ingested-files-per-partition",
+                long = "compaction-min-number-recent-ingested-files-per-partition",
                 env = "INFLUXDB_IOX_COMPACTION_MIN_NUMBER_RECENT_INGESTED_FILES_PER_PARTITION",
                 default_value = "1",
                 action
@@ -113,7 +113,7 @@ macro_rules! gen_compactor_config {
             /// Default is
             #[doc = $hot_multiple_default]
             #[clap(
-                long = "--compaction-hot-multiple",
+                long = "compaction-hot-multiple",
                 env = "INFLUXDB_IOX_COMPACTION_HOT_MULTIPLE",
                 default_value = $hot_multiple_default,
                 action
@@ -134,7 +134,7 @@ macro_rules! gen_compactor_config {
             ///
             /// Default is 30 * 1024 * 1024 * 1024 = 32,212,254,720 bytes (30GB).
             #[clap(
-                long = "--compaction-memory-budget-bytes",
+                long = "compaction-memory-budget-bytes",
                 env = "INFLUXDB_IOX_COMPACTION_MEMORY_BUDGET_BYTES",
                 default_value = "32212254720",
                 action
@@ -147,7 +147,7 @@ macro_rules! gen_compactor_config {
             /// to estimate number of rows allocated for each record batch fed into DataFusion plan.
             /// 
             #[clap(
-                long = "--compaction-min-rows-allocated-per-record-batch-to-plan",
+                long = "compaction-min-rows-allocated-per-record-batch-to-plan",
                 env = "INFLUXDB_IOX_COMPACTION_MIN_ROWS_PER_RECORD_BATCH_TO_PLAN",
                 default_value = "8192",
                 action
@@ -160,7 +160,7 @@ macro_rules! gen_compactor_config {
             /// there is a hard maximum on the number of files that can be compacted
             /// at once. This avoids a wide fan-in multi-way merge in the DataFusion plan
             #[clap(
-                long = "--compaction-max-num-compacting-files",
+                long = "compaction-max-num-compacting-files",
                 env = "INFLUXDB_IOX_COMPACTION_MAX_COMPACTING_FILES",
                 default_value = "20",
                 action
diff --git a/clap_blocks/src/ingester.rs b/clap_blocks/src/ingester.rs
index c574409f92..db3f27d245 100644
--- a/clap_blocks/src/ingester.rs
+++ b/clap_blocks/src/ingester.rs
@@ -6,7 +6,7 @@
 pub struct IngesterConfig {
     /// Write buffer shard index to start (inclusive) range with
     #[clap(
-        long = "--shard-index-range-start",
+        long = "shard-index-range-start",
         env = "INFLUXDB_IOX_SHARD_INDEX_RANGE_START",
         action
     )]
@@ -14,7 +14,7 @@ pub struct IngesterConfig {
 
     /// Write buffer shard index to end (inclusive) range with
     #[clap(
-        long = "--shard-index-range-end",
+        long = "shard-index-range-end",
         env = "INFLUXDB_IOX_SHARD_INDEX_RANGE_END",
         action
     )]
@@ -24,7 +24,7 @@ pub struct IngesterConfig {
     /// ingester buffer is below this size. If the ingester buffer hits this size, ingest from the
     /// write buffer will pause until the ingester buffer goes below this threshold.
     #[clap(
-        long = "--pause-ingest-size-bytes",
+        long = "pause-ingest-size-bytes",
         env = "INFLUXDB_IOX_PAUSE_INGEST_SIZE_BYTES",
         action
     )]
@@ -34,7 +34,7 @@ pub struct IngesterConfig {
     /// pick the largest partitions and persist them until it falls below this threshold. An
     /// ingester running in a steady state is expected to take up this much memory.
     #[clap(
-        long = "--persist-memory-threshold-bytes",
+        long = "persist-memory-threshold-bytes",
         env = "INFLUXDB_IOX_PERSIST_MEMORY_THRESHOLD_BYTES",
         action
     )]
@@ -47,7 +47,7 @@ pub struct IngesterConfig {
     /// NOTE: This number is related, but *NOT* the same as the size
     /// of the memory used to keep the partition buffered.
     #[clap(
-        long = "--persist-partition-size-threshold-bytes",
+        long = "persist-partition-size-threshold-bytes",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_SIZE_THRESHOLD_BYTES",
         default_value = "314572800",
         action
@@ -58,7 +58,7 @@ pub struct IngesterConfig {
     /// persisted. This puts an upper bound on how far back the ingester may need to read from the
     /// write buffer on restart or recovery. The default value is 30 minutes (in seconds).
     #[clap(
-        long = "--persist-partition-age-threshold-seconds",
+        long = "persist-partition-age-threshold-seconds",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_AGE_THRESHOLD_SECONDS",
         default_value = "1800",
         action
@@ -68,7 +68,7 @@ pub struct IngesterConfig {
     /// If a partition has had data buffered and hasn't received a write for this
     /// period of time, it will be persisted. The default value is 300 seconds (5 minutes).
     #[clap(
-        long = "--persist-partition-cold-threshold-seconds",
+        long = "persist-partition-cold-threshold-seconds",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_COLD_THRESHOLD_SECONDS",
         default_value = "300",
         action
@@ -77,7 +77,7 @@ pub struct IngesterConfig {
 
     /// Trigger persistence of a partition if it contains more than this many rows.
     #[clap(
-        long = "--persist-partition-max-rows",
+        long = "persist-partition-max-rows",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_MAX_ROWS",
         default_value = "500000",
         action
@@ -89,7 +89,7 @@ pub struct IngesterConfig {
     /// specified, the ingester will skip any sequence numbers that have not been retained in the
     /// write buffer and will start up successfully with the oldest available data.
     #[clap(
-        long = "--skip-to-oldest-available",
+        long = "skip-to-oldest-available",
         env = "INFLUXDB_IOX_SKIP_TO_OLDEST_AVAILABLE",
         action
     )]
@@ -99,7 +99,7 @@ pub struct IngesterConfig {
     ///
     /// The first N requests will panic. Requests after this will just pass.
     #[clap(
-        long = "--test-flight-do-get-panic",
+        long = "test-flight-do-get-panic",
         env = "INFLUXDB_IOX_FLIGHT_DO_GET_PANIC",
         default_value = "0",
         action
@@ -109,7 +109,7 @@ pub struct IngesterConfig {
     /// Sets how many concurrent requests the ingester will handle before rejecting
     /// incoming requests.
     #[clap(
-        long = "--concurrent-request-limit",
+        long = "concurrent-request-limit",
         env = "INFLUXDB_IOX_CONCURRENT_REQEST_LIMIT",
         default_value = "20",
         action
diff --git a/clap_blocks/src/object_store.rs b/clap_blocks/src/object_store.rs
index 3c6b5b1594..7842fb57fa 100644
--- a/clap_blocks/src/object_store.rs
+++ b/clap_blocks/src/object_store.rs
@@ -71,7 +71,7 @@ pub struct ObjectStoreConfig {
     ///    and `--azure-storage-access-key`.
     #[clap(
         value_enum,
-        long = "--object-store",
+        long = "object-store",
         env = "INFLUXDB_IOX_OBJECT_STORE",
         ignore_case = true,
         action
@@ -92,11 +92,11 @@ pub struct ObjectStoreConfig {
     /// container you've created in the associated storage account, under
     /// Blob Service > Containers. Must also set `--azure-storage-account` and
     /// `--azure-storage-access-key`.
-    #[clap(long = "--bucket", env = "INFLUXDB_IOX_BUCKET", action)]
+    #[clap(long = "bucket", env = "INFLUXDB_IOX_BUCKET", action)]
     pub bucket: Option<String>,
 
     /// The location InfluxDB IOx will use to store files locally.
-    #[clap(long = "--data-dir", env = "INFLUXDB_IOX_DB_DIR", action)]
+    #[clap(long = "data-dir", env = "INFLUXDB_IOX_DB_DIR", action)]
     pub database_directory: Option<PathBuf>,
 
     /// When using Amazon S3 as the object store, set this to an access key that
@@ -108,7 +108,7 @@ pub struct ObjectStoreConfig {
     ///
     /// Prefer the environment variable over the command line flag in shared
     /// environments.
-    #[clap(long = "--aws-access-key-id", env = "AWS_ACCESS_KEY_ID", action)]
+    #[clap(long = "aws-access-key-id", env = "AWS_ACCESS_KEY_ID", action)]
     pub aws_access_key_id: Option<String>,
 
     /// When using Amazon S3 as the object store, set this to the secret access
@@ -119,11 +119,7 @@ pub struct ObjectStoreConfig {
     ///
     /// Prefer the environment variable over the command line flag in shared
     /// environments.
-    #[clap(
-        long = "--aws-secret-access-key",
-        env = "AWS_SECRET_ACCESS_KEY",
-        action
-    )]
+    #[clap(long = "aws-secret-access-key", env = "AWS_SECRET_ACCESS_KEY", action)]
     pub aws_secret_access_key: Option<String>,
 
     /// When using Amazon S3 as the object store, set this to the region
@@ -133,7 +129,7 @@ pub struct ObjectStoreConfig {
     /// Must also set `--object-store=s3`, `--bucket`, `--aws-access-key-id`,
     /// and `--aws-secret-access-key`.
     #[clap(
-        long = "--aws-default-region",
+        long = "aws-default-region",
         env = "AWS_DEFAULT_REGION",
         default_value = FALLBACK_AWS_REGION,
         action,
@@ -148,7 +144,7 @@ pub struct ObjectStoreConfig {
     ///
     /// Prefer the environment variable over the command line flag in shared
     /// environments.
-    #[clap(long = "--aws-endpoint", env = "AWS_ENDPOINT", action)]
+    #[clap(long = "aws-endpoint", env = "AWS_ENDPOINT", action)]
     pub aws_endpoint: Option<String>,
 
     /// When using Amazon S3 as an object store, set this to the session token. This is handy when using a federated
@@ -158,11 +154,11 @@ pub struct ObjectStoreConfig {
     ///
     /// Prefer the environment variable over the command line flag in shared
     /// environments.
-    #[clap(long = "--aws-session-token", env = "AWS_SESSION_TOKEN", action)]
+    #[clap(long = "aws-session-token", env = "AWS_SESSION_TOKEN", action)]
     pub aws_session_token: Option<String>,
 
     /// Allow unencrypted HTTP connection to AWS.
-    #[clap(long = "--aws-allow-http", env = "AWS_ALLOW_HTTP", action)]
+    #[clap(long = "aws-allow-http", env = "AWS_ALLOW_HTTP", action)]
     pub aws_allow_http: bool,
 
     /// When using Google Cloud Storage as the object store, set this to the
@@ -170,7 +166,7 @@ pub struct ObjectStoreConfig {
     ///
     /// Must also set `--object-store=google` and `--bucket`.
     #[clap(
-        long = "--google-service-account",
+        long = "google-service-account",
         env = "GOOGLE_SERVICE_ACCOUNT",
         action
     )]
@@ -181,11 +177,7 @@ pub struct ObjectStoreConfig {
     ///
     /// Must also set `--object-store=azure`, `--bucket`, and
     /// `--azure-storage-access-key`.
-    #[clap(
-        long = "--azure-storage-account",
-        env = "AZURE_STORAGE_ACCOUNT",
-        action
-    )]
+    #[clap(long = "azure-storage-account", env = "AZURE_STORAGE_ACCOUNT", action)]
     pub azure_storage_account: Option<String>,
 
     /// When using Microsoft Azure as the object store, set this to one of the
@@ -197,7 +189,7 @@ pub struct ObjectStoreConfig {
     /// Prefer the environment variable over the command line flag in shared
     /// environments.
     #[clap(
-        long = "--azure-storage-access-key",
+        long = "azure-storage-access-key",
         env = "AZURE_STORAGE_ACCESS_KEY",
         action
     )]
@@ -205,7 +197,7 @@ pub struct ObjectStoreConfig {
 
     /// When using a network-based object store, limit the number of connection to this value.
     #[clap(
-        long = "--object-store-connection-limit",
+        long = "object-store-connection-limit",
         env = "OBJECT_STORE_CONNECTION_LIMIT",
         default_value = "16",
         action
diff --git a/clap_blocks/src/querier.rs b/clap_blocks/src/querier.rs
index e22f7fc444..f01ea50f51 100644
--- a/clap_blocks/src/querier.rs
+++ b/clap_blocks/src/querier.rs
@@ -45,7 +45,7 @@ pub struct QuerierConfig {
     ///
     /// If not specified, defaults to the number of cores on the system
     #[clap(
-        long = "--num-query-threads",
+        long = "num-query-threads",
         env = "INFLUXDB_IOX_NUM_QUERY_THREADS",
         action
     )]
@@ -114,7 +114,7 @@ pub struct QuerierConfig {
     /// }
     /// ```
     #[clap(
-        long = "--shard-to-ingesters-file",
+        long = "shard-to-ingesters-file",
         env = "INFLUXDB_IOX_SHARD_TO_INGESTERS_FILE",
         action
     )]
@@ -183,7 +183,7 @@ pub struct QuerierConfig {
     /// }
     /// ```
     #[clap(
-        long = "--shard-to-ingesters",
+        long = "shard-to-ingesters",
         env = "INFLUXDB_IOX_SHARD_TO_INGESTERS",
         action
     )]
@@ -191,7 +191,7 @@ pub struct QuerierConfig {
 
     /// Size of the RAM cache used to store catalog metadata information in bytes.
     #[clap(
-        long = "--ram-pool-metadata-bytes",
+        long = "ram-pool-metadata-bytes",
         env = "INFLUXDB_IOX_RAM_POOL_METADATA_BYTES",
         default_value = "134217728",  // 128MB
         action
@@ -200,7 +200,7 @@ pub struct QuerierConfig {
 
     /// Size of the RAM cache used to store data in bytes.
     #[clap(
-        long = "--ram-pool-data-bytes",
+        long = "ram-pool-data-bytes",
         env = "INFLUXDB_IOX_RAM_POOL_DATA_BYTES",
         default_value = "1073741824",  // 1GB
         action
@@ -209,7 +209,7 @@ pub struct QuerierConfig {
 
     /// Limit the number of concurrent queries.
     #[clap(
-        long = "--max-concurrent-queries",
+        long = "max-concurrent-queries",
         env = "INFLUXDB_IOX_MAX_CONCURRENT_QUERIES",
         default_value = "10",
         action
@@ -222,7 +222,7 @@ pub struct QuerierConfig {
     /// in a query, the query will error. This protects against potentially unbounded
     /// memory growth leading to OOMs in certain pathological queries.
     #[clap(
-        long = "--max-table-query-bytes",
+        long = "max-table-query-bytes",
         env = "INFLUXDB_IOX_MAX_TABLE_QUERY_BYTES",
         default_value = "1073741824",  // 1 GB
         action
diff --git a/clap_blocks/src/run_config.rs b/clap_blocks/src/run_config.rs
index 167216e51c..e5c593905e 100644
--- a/clap_blocks/src/run_config.rs
+++ b/clap_blocks/src/run_config.rs
@@ -23,7 +23,7 @@ pub struct RunConfig {
 
     /// The address on which IOx will serve HTTP API requests.
     #[clap(
-        long = "--api-bind",
+        long = "api-bind",
         env = "INFLUXDB_IOX_BIND_ADDR",
         default_value = DEFAULT_API_BIND_ADDR,
         action,
@@ -32,7 +32,7 @@ pub struct RunConfig {
 
     /// The address on which IOx will serve Storage gRPC API requests.
     #[clap(
-        long = "--grpc-bind",
+        long = "grpc-bind",
         env = "INFLUXDB_IOX_GRPC_BIND_ADDR",
         default_value = DEFAULT_GRPC_BIND_ADDR,
         action,
@@ -41,7 +41,7 @@ pub struct RunConfig {
 
     /// Maximum size of HTTP requests.
     #[clap(
-        long = "--max-http-request-size",
+        long = "max-http-request-size",
         env = "INFLUXDB_IOX_MAX_HTTP_REQUEST_SIZE",
         default_value = "10485760", // 10 MiB
         action,
diff --git a/clap_blocks/src/write_buffer.rs b/clap_blocks/src/write_buffer.rs
index fca5e73c85..3587dab3ab 100644
--- a/clap_blocks/src/write_buffer.rs
+++ b/clap_blocks/src/write_buffer.rs
@@ -15,16 +15,12 @@ pub struct WriteBufferConfig {
     /// The type of write buffer to use.
     ///
     /// Valid options are: file, kafka
-    #[clap(
-        long = "--write-buffer",
-        env = "INFLUXDB_IOX_WRITE_BUFFER_TYPE",
-        action
-    )]
+    #[clap(long = "write-buffer", env = "INFLUXDB_IOX_WRITE_BUFFER_TYPE", action)]
     pub(crate) type_: String,
 
     /// The address to the write buffer.
     #[clap(
-        long = "--write-buffer-addr",
+        long = "write-buffer-addr",
         env = "INFLUXDB_IOX_WRITE_BUFFER_ADDR",
         action
     )]
@@ -32,7 +28,7 @@ pub struct WriteBufferConfig {
 
     /// Write buffer topic/database that should be used.
     #[clap(
-        long = "--write-buffer-topic",
+        long = "write-buffer-topic",
         env = "INFLUXDB_IOX_WRITE_BUFFER_TOPIC",
         default_value = "iox-shared",
         action
@@ -49,7 +45,7 @@ pub struct WriteBufferConfig {
     ///
     /// Environment variables are passed as `key1=value1,key2=value2,...`.
     #[clap(
-        long = "--write-buffer-connection-config",
+        long = "write-buffer-connection-config",
         env = "INFLUXDB_IOX_WRITE_BUFFER_CONNECTION_CONFIG",
         default_value = "",
         use_value_delimiter = true
@@ -58,7 +54,7 @@ pub struct WriteBufferConfig {
 
     /// The number of topics to create automatically, if any. Default is to not create any topics.
     #[clap(
-        long = "--write-buffer-auto-create-topics",
+        long = "write-buffer-auto-create-topics",
         env = "INFLUXDB_IOX_WRITE_BUFFER_AUTO_CREATE_TOPICS"
     )]
     pub(crate) auto_create_topics: Option<NonZeroU32>,
diff --git a/influxdb_iox/src/commands/compactor.rs b/influxdb_iox/src/commands/compactor.rs
index ecd7b5c578..e216e96189 100644
--- a/influxdb_iox/src/commands/compactor.rs
+++ b/influxdb_iox/src/commands/compactor.rs
@@ -34,7 +34,7 @@ pub enum Command {
 
         /// Number of threads to use for the compactor query execution, compaction and persistence.
         #[clap(
-            long = "--query-exec-thread-count",
+            long = "query-exec-thread-count",
             env = "INFLUXDB_IOX_QUERY_EXEC_THREAD_COUNT",
             default_value = "4",
             action
diff --git a/influxdb_iox/src/commands/compactor/generate.rs b/influxdb_iox/src/commands/compactor/generate.rs
index 049dc54ef1..e830c95588 100644
--- a/influxdb_iox/src/commands/compactor/generate.rs
+++ b/influxdb_iox/src/commands/compactor/generate.rs
@@ -28,7 +28,7 @@ pub struct Config {
     #[clap(
         value_enum,
         value_parser,
-        long = "--compaction-type",
+        long = "compaction-type",
         env = "INFLUXDB_IOX_COMPACTOR_GENERATE_TYPE",
         default_value = "hot",
         action
@@ -38,7 +38,7 @@ pub struct Config {
     /// The number of IOx partitions to generate files for. Each partition will have the number
     /// of files specified by `--num-files` generated.
     #[clap(
-        long = "--num-partitions",
+        long = "num-partitions",
         env = "INFLUXDB_IOX_COMPACTOR_GENERATE_NUM_PARTITIONS",
         default_value = "1",
         action
@@ -47,7 +47,7 @@ pub struct Config {
 
     /// The number of parquet files to generate per partition.
     #[clap(
-        long = "--num-files",
+        long = "num-files",
         env = "INFLUXDB_IOX_COMPACTOR_GENERATE_NUM_FILES",
         default_value = "1",
         action
@@ -58,7 +58,7 @@ pub struct Config {
     /// timestamp. Additional columns will be given a type in I64, F64, String, Bool, and
     /// Tag in equal proportion.
     #[clap(
-        long = "--num-cols",
+        long = "num-cols",
         env = "INFLUXDB_IOX_COMPACTOR_GENERATE_NUM_COLS",
         default_value = "6",
         action
@@ -67,7 +67,7 @@ pub struct Config {
 
     /// The number of rows to generate in each file.
     #[clap(
-        long = "--num-rows",
+        long = "num-rows",
         env = "INFLUXDB_IOX_COMPACTOR_GENERATE_NUM_ROWS",
         default_value = "1",
         action
diff --git a/influxdb_iox/src/commands/query_ingester.rs b/influxdb_iox/src/commands/query_ingester.rs
index 879b9717cd..987e4c5d18 100644
--- a/influxdb_iox/src/commands/query_ingester.rs
+++ b/influxdb_iox/src/commands/query_ingester.rs
@@ -39,16 +39,12 @@ pub struct Config {
     table: String,
 
     /// The columns to request
-    #[clap(
-        long = "--columns",
-        use_value_delimiter = true,
-        action
-    )]
+    #[clap(long = "columns", use_value_delimiter = true, action)]
     columns: Vec<String>,
 
     /// Predicate in base64 protobuf encoded form.
     /// (logged on error)
-    #[clap(long = "--predicate-base64", action)]
+    #[clap(long = "predicate-base64", action)]
     predicate_base64: Option<String>,
 
     /// Optional format ('pretty', 'json', or 'csv')
diff --git a/influxdb_iox/src/commands/run/all_in_one.rs b/influxdb_iox/src/commands/run/all_in_one.rs
index a5a8a24f93..b00415d5d3 100644
--- a/influxdb_iox/src/commands/run/all_in_one.rs
+++ b/influxdb_iox/src/commands/run/all_in_one.rs
@@ -159,7 +159,7 @@ pub struct Config {
 
     /// Maximum size of HTTP requests.
     #[clap(
-        long = "--max-http-request-size",
+        long = "max-http-request-size",
         env = "INFLUXDB_IOX_MAX_HTTP_REQUEST_SIZE",
         default_value = "10485760", // 10 MiB
         action,
@@ -177,7 +177,7 @@ pub struct Config {
     /// ingest from the write buffer until persistence goes below this threshold.
     /// The default value is 100 GB (in bytes).
     #[clap(
-        long = "--pause-ingest-size-bytes",
+        long = "pause-ingest-size-bytes",
         env = "INFLUXDB_IOX_PAUSE_INGEST_SIZE_BYTES",
         default_value = "107374182400",
         action
@@ -190,7 +190,7 @@ pub struct Config {
     /// a steady state is expected to take up this much memory.
     /// The default value is 1 GB (in bytes).
     #[clap(
-        long = "--persist-memory-threshold-bytes",
+        long = "persist-memory-threshold-bytes",
         env = "INFLUXDB_IOX_PERSIST_MEMORY_THRESHOLD_BYTES",
         default_value = "1073741824",
         action
@@ -204,7 +204,7 @@ pub struct Config {
     /// NOTE: This number is related, but *NOT* the same as the size
     /// of the memory used to keep the partition buffered.
     #[clap(
-        long = "--persist-partition-size-threshold-bytes",
+        long = "persist-partition-size-threshold-bytes",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_SIZE_THRESHOLD_BYTES",
         default_value = "314572800",
         action
@@ -216,7 +216,7 @@ pub struct Config {
     /// ingester may need to read in the write buffer on restart or recovery. The default value
     /// is 30 minutes (in seconds).
     #[clap(
-        long = "--persist-partition-age-threshold-seconds",
+        long = "persist-partition-age-threshold-seconds",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_AGE_THRESHOLD_SECONDS",
         default_value = "1800",
         action
@@ -226,7 +226,7 @@ pub struct Config {
     /// If a partition has had data buffered and hasn't received a write for this
     /// period of time, it will be persisted. The default value is 300 seconds (5 minutes).
     #[clap(
-        long = "--persist-partition-cold-threshold-seconds",
+        long = "persist-partition-cold-threshold-seconds",
         env = "INFLUXDB_IOX_PERSIST_PARTITION_COLD_THRESHOLD_SECONDS",
         default_value = "300",
         action
@@ -235,7 +235,7 @@ pub struct Config {
 
     /// The address on which IOx will serve Router HTTP API requests
     #[clap(
-        long = "--router-http-bind",
+        long = "router-http-bind",
         // by default, write API requests go to router
         alias = "api-bind",
         env = "INFLUXDB_IOX_ROUTER_HTTP_BIND_ADDR",
@@ -246,7 +246,7 @@ pub struct Config {
 
     /// The address on which IOx will serve Router gRPC API requests
     #[clap(
-        long = "--router-grpc-bind",
+        long = "router-grpc-bind",
         env = "INFLUXDB_IOX_ROUTER_GRPC_BIND_ADDR",
         default_value = DEFAULT_ROUTER_GRPC_BIND_ADDR,
         action,
@@ -255,7 +255,7 @@ pub struct Config {
 
     /// The address on which IOx will serve Querier gRPC API requests
     #[clap(
-        long = "--querier-grpc-bind",
+        long = "querier-grpc-bind",
         // by default, grpc requests go to querier
         alias = "grpc-bind",
         env = "INFLUXDB_IOX_QUERIER_GRPC_BIND_ADDR",
@@ -266,7 +266,7 @@ pub struct Config {
 
     /// The address on which IOx will serve Router Ingester API requests
     #[clap(
-        long = "--ingester-grpc-bind",
+        long = "ingester-grpc-bind",
         env = "INFLUXDB_IOX_INGESTER_GRPC_BIND_ADDR",
         default_value = DEFAULT_INGESTER_GRPC_BIND_ADDR,
         action,
@@ -275,7 +275,7 @@ pub struct Config {
 
     /// The address on which IOx will serve Router Compactor API requests
     #[clap(
-        long = "--compactor-grpc-bind",
+        long = "compactor-grpc-bind",
         env = "INFLUXDB_IOX_COMPACTOR_GRPC_BIND_ADDR",
         default_value = DEFAULT_COMPACTOR_GRPC_BIND_ADDR,
         action,
@@ -284,7 +284,7 @@ pub struct Config {
 
     /// Size of the querier RAM cache used to store catalog metadata information in bytes.
     #[clap(
-        long = "--querier-ram-pool-metadata-bytes",
+        long = "querier-ram-pool-metadata-bytes",
         env = "INFLUXDB_IOX_QUERIER_RAM_POOL_METADATA_BYTES",
         default_value = "134217728",  // 128MB
         action
@@ -293,7 +293,7 @@ pub struct Config {
 
     /// Size of the querier RAM cache used to store data in bytes.
     #[clap(
-        long = "--querier-ram-pool-data-bytes",
+        long = "querier-ram-pool-data-bytes",
         env = "INFLUXDB_IOX_QUERIER_RAM_POOL_DATA_BYTES",
         default_value = "1073741824",  // 1GB
         action
@@ -302,7 +302,7 @@ pub struct Config {
 
     /// Limit the number of concurrent queries.
     #[clap(
-        long = "--querier-max-concurrent-queries",
+        long = "querier-max-concurrent-queries",
         env = "INFLUXDB_IOX_QUERIER_MAX_CONCURRENT_QUERIES",
         default_value = "10",
         action
@@ -315,7 +315,7 @@ pub struct Config {
     /// in a query, the query will error. This protects against potentially unbounded
     /// memory growth leading to OOMs in certain pathological queries.
     #[clap(
-        long = "--querier-max-table-query-bytes",
+        long = "querier-max-table-query-bytes",
         env = "INFLUXDB_IOX_QUERIER_MAX_TABLE_QUERY_BYTES",
         default_value = "1073741824",  // 1 GB
         action
diff --git a/influxdb_iox/src/commands/run/compactor.rs b/influxdb_iox/src/commands/run/compactor.rs
index 4d710faf6b..646dca3d6e 100644
--- a/influxdb_iox/src/commands/run/compactor.rs
+++ b/influxdb_iox/src/commands/run/compactor.rs
@@ -66,7 +66,7 @@ pub struct Config {
 
     /// Number of threads to use for the compactor query execution, compaction and persistence.
     #[clap(
-        long = "--query-exec-thread-count",
+        long = "query-exec-thread-count",
         env = "INFLUXDB_IOX_QUERY_EXEC_THREAD_COUNT",
         default_value = "4",
         action
diff --git a/influxdb_iox/src/commands/run/ingester.rs b/influxdb_iox/src/commands/run/ingester.rs
index da56c71e5f..bf71fb498b 100644
--- a/influxdb_iox/src/commands/run/ingester.rs
+++ b/influxdb_iox/src/commands/run/ingester.rs
@@ -67,7 +67,7 @@ pub struct Config {
 
     /// Number of threads to use for the ingester query execution, compaction and persistence.
     #[clap(
-        long = "--query-exec-thread-count",
+        long = "query-exec-thread-count",
         env = "INFLUXDB_IOX_QUERY_EXEC_THREAD_COUNT",
         default_value = "4",
         action
diff --git a/influxdb_iox/src/commands/run/router.rs b/influxdb_iox/src/commands/run/router.rs
index 5722d306f2..e888b3783b 100644
--- a/influxdb_iox/src/commands/run/router.rs
+++ b/influxdb_iox/src/commands/run/router.rs
@@ -64,7 +64,7 @@ pub struct Config {
 
     /// Query pool name to dispatch writes to.
     #[clap(
-        long = "--query-pool",
+        long = "query-pool",
         env = "INFLUXDB_IOX_QUERY_POOL_NAME",
         default_value = "iox-shared",
         action
@@ -81,7 +81,7 @@ pub struct Config {
     /// A default maximum of 200 requests, multiplied by the default 10MiB
     /// maximum for HTTP request bodies == ~2GiB.
     #[clap(
-        long = "--max-http-requests",
+        long = "max-http-requests",
         env = "INFLUXDB_IOX_MAX_HTTP_REQUESTS",
         default_value = "200",
         action
diff --git a/influxdb_iox/src/commands/run/test.rs b/influxdb_iox/src/commands/run/test.rs
index dbaee7c98f..fda22f56e4 100644
--- a/influxdb_iox/src/commands/run/test.rs
+++ b/influxdb_iox/src/commands/run/test.rs
@@ -44,7 +44,7 @@ pub struct Config {
     /// Test action
     #[clap(
         value_enum,
-        long = "--test-action",
+        long = "test-action",
         env = "IOX_TEST_ACTION",
         default_value = "None",
         ignore_case = true,
diff --git a/trace_exporters/src/lib.rs b/trace_exporters/src/lib.rs
index 6e544cf254..27f0ccacfe 100644
--- a/trace_exporters/src/lib.rs
+++ b/trace_exporters/src/lib.rs
@@ -47,7 +47,7 @@ pub struct TracingConfig {
     ///
     /// Can be one of: none, jaeger
     #[clap(
-        long = "--traces-exporter",
+        long = "traces-exporter",
         env = "TRACES_EXPORTER",
         default_value = "none",
         action
@@ -60,7 +60,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-exporter-jaeger-agent-host",
+        long = "traces-exporter-jaeger-agent-host",
         env = "TRACES_EXPORTER_JAEGER_AGENT_HOST",
         default_value = "0.0.0.0",
         action
@@ -73,7 +73,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-exporter-jaeger-agent-port",
+        long = "traces-exporter-jaeger-agent-port",
         env = "TRACES_EXPORTER_JAEGER_AGENT_PORT",
         default_value = "6831",
         action
@@ -84,7 +84,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-exporter-jaeger-service-name",
+        long = "traces-exporter-jaeger-service-name",
         env = "TRACES_EXPORTER_JAEGER_SERVICE_NAME",
         default_value = "iox-conductor",
         action
@@ -95,7 +95,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-exporter-jaeger-trace-context-header-name",
+        long = "traces-exporter-jaeger-trace-context-header-name",
         env = "TRACES_EXPORTER_JAEGER_TRACE_CONTEXT_HEADER_NAME",
         default_value = DEFAULT_JAEGER_TRACE_CONTEXT_HEADER_NAME,
         action,
@@ -106,7 +106,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-jaeger-debug-name",
+        long = "traces-jaeger-debug-name",
         env = "TRACES_EXPORTER_JAEGER_DEBUG_NAME",
         default_value = "jaeger-debug-id",
         action
@@ -119,7 +119,7 @@ pub struct TracingConfig {
     ///
     /// Only used if `--traces-exporter` is "jaeger".
     #[clap(
-        long = "--traces-jaeger-tags",
+        long = "traces-jaeger-tags",
         env = "TRACES_EXPORTER_JAEGER_TAGS",
         value_delimiter = ',',
         action
diff --git a/trogging/src/cli.rs b/trogging/src/cli.rs
index a450bf3305..57ce586693 100644
--- a/trogging/src/cli.rs
+++ b/trogging/src/cli.rs
@@ -23,7 +23,7 @@ pub struct LoggingConfig {
     ///
     /// If None, [`crate::Builder`] sets a default, by default [`crate::Builder::DEFAULT_LOG_FILTER`],
     /// but overrideable with [`crate::Builder::with_default_log_filter`].
-    #[clap(long = "--log-filter", env = "LOG_FILTER", action)]
+    #[clap(long = "log-filter", env = "LOG_FILTER", action)]
     pub log_filter: Option<String>,
 
     /// Logs: filter short-hand
@@ -38,7 +38,7 @@ pub struct LoggingConfig {
     /// -vvv 'trace,hyper::proto::h1=info,h2=info'
     #[clap(
         short = 'v',
-        long = "--verbose",
+        long = "verbose",
         action = clap::ArgAction::Count,
     )]
     pub log_verbose_count: u8,
@@ -49,7 +49,7 @@ pub struct LoggingConfig {
     //
     // TODO(jacobmarble): consider adding file path, file rotation, syslog, ?
     #[clap(
-        long = "--log-destination",
+        long = "log-destination",
         env = "LOG_DESTINATION",
         default_value = "stdout",
         verbatim_doc_comment,
@@ -93,7 +93,7 @@ pub struct LoggingConfig {
     ///   level=debug msg="This is a debug message" target="logging" location="logfmt/tests/logging.rs:37" time=1612181556329618000
     ///   level=trace msg="This is a trace message" target="logging" location="logfmt/tests/logging.rs:38" time=1612181556329634000
     #[clap(
-        long = "--log-format",
+        long = "log-format",
         env = "LOG_FORMAT",
         default_value = "full",
         verbatim_doc_comment,