diff --git a/docs/src/kubectl-plugin.md b/docs/src/kubectl-plugin.md
old mode 100755
new mode 100644
index e066bbc082..2b430dd9e0
--- a/docs/src/kubectl-plugin.md
+++ b/docs/src/kubectl-plugin.md
@@ -169,7 +169,7 @@ sudo mv kubectl_complete-cnpg /usr/local/bin
 Once the plugin is installed and deployed, you can start using it like this:
 
 ```sh
-kubectl cnpg <command> <args...>
+kubectl cnpg COMMAND [ARGS...]
 ```
 
 !!! Note
@@ -346,16 +346,16 @@ The command also supports output in `yaml` and `json` format.
 ### Promote
 
 The meaning of this command is to `promote` a pod in the cluster to primary, so you
-can start with maintenance work or test a switch-over situation in your cluster
+can start with maintenance work or test a switch-over situation in your cluster:
 
 ```sh
-kubectl cnpg promote cluster-example cluster-example-2
+kubectl cnpg promote CLUSTER CLUSTER-INSTANCE
 ```
 
-Or you can use the instance node number to promote
+Or you can use the instance node number to promote:
 
 ```sh
-kubectl cnpg promote cluster-example 2
+kubectl cnpg promote CLUSTER INSTANCE
 ```
 
 ### Certificates
@@ -364,13 +364,13 @@ Clusters created using the CloudNativePG operator work with a CA to sign
 a TLS authentication certificate.
 
 To get a certificate, you need to provide a name for the secret to store
-the credentials, the cluster name, and a user for this certificate
+the credentials, the cluster name, and a user for this certificate:
 
 ```sh
-kubectl cnpg certificate cluster-cert --cnpg-cluster cluster-example --cnpg-user appuser
+kubectl cnpg certificate cluster-cert --cnpg-cluster CLUSTER --cnpg-user USER
 ```
 
-After the secret it's created, you can get it using `kubectl`
+After the secret it's created, you can get it using `kubectl`:
 
 ```sh
 kubectl get secret cluster-cert
@@ -388,7 +388,7 @@ The `kubectl cnpg restart` command can be used in two cases:
 
 - requesting the operator to orchestrate a rollout restart
   for a certain cluster. This is useful to apply
-  configuration changes to cluster dependent objects, such as ConfigMaps
+  configuration changes to cluster dependent objects, such as `ConfigMaps`
   containing custom monitoring queries.
 
 - request a single instance restart, either in-place if the instance is
@@ -397,10 +397,10 @@ The `kubectl cnpg restart` command can be used in two cases:
 
 ```sh
 # this command will restart a whole cluster in a rollout fashion
-kubectl cnpg restart [clusterName]
+kubectl cnpg restart CLUSTER
 
 # this command will restart a single instance, according to the policy above
-kubectl cnpg restart [clusterName] [pod]
+kubectl cnpg restart CLUSTER INSTANCE
 ```
 
 If the in-place restart is requested but the change cannot be applied without
@@ -420,7 +420,7 @@ to cluster dependent objects, such as ConfigMaps containing custom monitoring qu
 The following command will reload all configurations for a given cluster:
 
 ```sh
-kubectl cnpg reload [cluster_name]
+kubectl cnpg reload CLUSTER
 ```
 
 ### Maintenance
@@ -503,7 +503,7 @@ default time-stamped filename is created for the zip file.
     E.g. the default installation namespace is cnpg-system
 
 ```sh
-kubectl cnpg report operator -n <namespace>
+kubectl cnpg report operator -n cnpg-system
 ```
 
 results in
@@ -515,7 +515,7 @@ Successfully written report to "report_operator_<TIMESTAMP>.zip" (format: "yaml"
 With the `-f` flag set:
 
 ```sh
-kubectl cnpg report operator -n <namespace> -f reportRedacted.zip
+kubectl cnpg report operator -n cnpg-system -f reportRedacted.zip
 ```
 
 Unzipping the file will produce a time-stamped top-level folder to keep the
@@ -592,7 +592,7 @@ metadata:
 With the `-S` (`--stopRedaction`) option activated, secrets are shown:
 
 ```sh
-kubectl cnpg report operator -n <namespace> -f reportNonRedacted.zip -S
+kubectl cnpg report operator -n cnpg-system -f reportNonRedacted.zip -S
 ```
 
 You'll get a reminder that you're about to view confidential information:
@@ -641,7 +641,7 @@ so the `-S` is disabled.
 Usage:
 
 ```sh
-kubectl cnpg report cluster <clusterName> [flags]
+kubectl cnpg report cluster CLUSTER [flags]
 ```
 
 Note that, unlike the `operator` sub-command, for the `cluster` sub-command you
@@ -649,7 +649,7 @@ need to provide the cluster name, and very likely the namespace, unless the clus
 is in the default one.
 
 ```sh
-kubectl cnpg report cluster example -f report.zip -n example_namespace
+kubectl cnpg report cluster CLUSTER -f report.zip [-n NAMESPACE]
 ```
 
 and then:
@@ -671,7 +671,7 @@ Archive:  report.zip
 Remember that you can use the `--logs` flag to add the pod and job logs to the ZIP.
 
 ```sh
-kubectl cnpg report cluster example -n example_namespace --logs
+kubectl cnpg report cluster CLUSTER [-n NAMESPACE] --logs
 ```
 
 will result in:
@@ -751,20 +751,20 @@ which takes `-f` to mean the logs should be followed.
 Usage:
 
 ```sh
-kubectl cnpg logs cluster <clusterName> [flags]
+kubectl cnpg logs cluster CLUSTER [flags]
 ```
 
 Using the `-f` option to follow:
 
 ```sh
-kubectl cnpg report cluster cluster-example -f
+kubectl cnpg report cluster CLUSTER -f
 ```
 
 Using `--tail` option to display 3 lines from each pod and the `-f` option
 to follow:
 
 ```sh
-kubectl cnpg report cluster cluster-example -f --tail 3
+kubectl cnpg report cluster CLUSTER -f --tail 3
 ```
 
 ```output
@@ -777,7 +777,7 @@ kubectl cnpg report cluster cluster-example -f --tail 3
 With the `-o` option omitted, and with `--output` specified:
 
 ```console
-$ kubectl cnpg logs cluster cluster-example --output my-cluster.log
+$ kubectl cnpg logs cluster CLUSTER --output my-cluster.log
 
 Successfully written logs to "my-cluster.log"
 ```
@@ -869,7 +869,7 @@ detached PVCs.
 Usage:
 
 ```sh
-kubectl cnpg destroy [CLUSTER_NAME] [INSTANCE_ID]
+kubectl cnpg destroy CLUSTER INSTANCE
 ```
 
 The following example removes the `cluster-example-2` pod and the associated
@@ -895,7 +895,7 @@ instance.
 You can hibernate a cluster with:
 
 ```sh
-kubectl cnpg hibernate on <cluster-name>
+kubectl cnpg hibernate on CLUSTER
 ```
 
 This will:
@@ -918,13 +918,13 @@ In case of error the operator will not be able to revert the procedure. You can
 still force the operation with:
 
 ```sh
-kubectl cnpg hibernate on cluster-example --force
+kubectl cnpg hibernate on CLUSTER --force
 ```
 
 A hibernated cluster can be resumed with:
 
 ```sh
-kubectl cnpg hibernate off <cluster-name>
+kubectl cnpg hibernate off CLUSTER
 ```
 
 Once the cluster has been hibernated, it's possible to show the last
@@ -932,7 +932,7 @@ configuration and the status that PostgreSQL had after it was shut down.
 That can be done with:
 
 ```sh
-kubectl cnpg hibernate status <cluster-name>
+kubectl cnpg hibernate status CLUSTER
 ```
 
 ### Benchmarking the database with pgbench
@@ -941,7 +941,7 @@ Pgbench can be run against an existing PostgreSQL cluster with following
 command:
 
 ```sh
-kubectl cnpg pgbench <cluster-name> -- --time 30 --client 1 --jobs 1
+kubectl cnpg pgbench CLUSTER -- --time 30 --client 1 --jobs 1
 ```
 
 Refer to the [Benchmarking pgbench section](benchmarking.md#pgbench) for more
@@ -949,10 +949,10 @@ details.
 
 ### Benchmarking the storage with fio
 
-fio can be run on an existing storage class with following command:
+`fio` can be run on an existing storage class with following command:
 
 ```sh
-kubectl cnpg fio <fio-job-name> -n <namespace>
+kubectl cnpg fio FIO_JOB_NAME [-n NAMESPACE]
 ```
 
 Refer to the [Benchmarking fio section](benchmarking.md#fio) for more details.
@@ -965,13 +965,13 @@ an existing Postgres cluster by creating a new `Backup` resource.
 The following example requests an on-demand backup for a given cluster:
 
 ```sh
-kubectl cnpg backup [cluster_name]
+kubectl cnpg backup CLUSTER
 ```
 
 or, if using volume snapshots:
 
 ```sh
-kubectl cnpg backup [cluster_name] -m volumeSnapshot
+kubectl cnpg backup CLUSTER -m volumeSnapshot
 ```
 
 The created backup will be named after the request time:
@@ -995,7 +995,7 @@ the configuration settings.
 
 ### Launching psql
 
-The `kubectl cnpg psql` command starts a new PostgreSQL interactive front-end
+The `kubectl cnpg psql CLUSTER` command starts a new PostgreSQL interactive front-end
 process (psql) connected to an existing Postgres cluster, as if you were running
 it from the actual pod. This means that you will be using the `postgres` user.
 
@@ -1136,20 +1136,20 @@ command. The basic structure of this command is as follows:
 
 ```sh
 kubectl cnpg publication create \
-  --publication <PUBLICATION_NAME> \
-  [--external-cluster <EXTERNAL_CLUSTER>]
-  <LOCAL_CLUSTER> [options]
+  --publication PUBLICATION_NAME \
+  [--external-cluster EXTERNAL_CLUSTER]
+  LOCAL_CLUSTER [options]
 ```
 
 There are two primary use cases:
 
 - With `--external-cluster`: Use this option to create a publication on an
   external cluster (i.e. defined in the `externalClusters` stanza). The commands
-  will be issued from the `<LOCAL_CLUSTER>`, but the publication will be for the
-  data in `<EXTERNAL_CLUSTER>`.
+  will be issued from the `LOCAL_CLUSTER`, but the publication will be for the
+  data in `EXTERNAL_CLUSTER`.
 
 - Without `--external-cluster`: Use this option to create a publication in the
-  `<LOCAL_CLUSTER>` PostgreSQL `Cluster` (by default, the `app` database).
+  `LOCAL_CLUSTER` PostgreSQL `Cluster` (by default, the `app` database).
 
 !!! Warning
     When connecting to an external cluster, ensure that the specified user has
@@ -1215,9 +1215,9 @@ following command structure:
 
 ```sh
 kubectl cnpg publication drop \
-  --publication <PUBLICATION_NAME> \
-  [--external-cluster <EXTERNAL_CLUSTER>]
-  <LOCAL_CLUSTER> [options]
+  --publication PUBLICATION_NAME \
+  [--external-cluster EXTERNAL_CLUSTER]
+  LOCAL_CLUSTER [options]
 ```
 
 To access further details and precise instructions, use the following command:
@@ -1253,15 +1253,15 @@ command. The basic structure of this command is as follows:
 
 ```sh
 kubectl cnpg subscription create \
-  --subscription <SUBSCRIPTION_NAME> \
-  --publication <PUBLICATION_NAME> \
-  --external-cluster <EXTERNAL_CLUSTER> \
-  <LOCAL_CLUSTER> [options]
+  --subscription SUBSCRIPTION_NAME \
+  --publication PUBLICATION_NAME \
+  --external-cluster EXTERNAL_CLUSTER \
+  LOCAL_CLUSTER [options]
 ```
 
 This command configures a subscription directed towards the specified
 publication in the designated external cluster, as defined in the
-`externalClusters` stanza of the `<LOCAL_CLUSTER>`.
+`externalClusters` stanza of the `LOCAL_CLUSTER`.
 
 For additional information and detailed instructions, type the following
 command:
@@ -1303,8 +1303,8 @@ You can drop a `SUBSCRIPTION` with the following command structure:
 
 ```sh
 kubectl cnpg subcription drop \
-  --subscription <SUBSCRIPTION_NAME> \
-  <LOCAL_CLUSTER> [options]
+  --subscription SUBSCRIPTION_NAME \
+  LOCAL_CLUSTER [options]
 ```
 
 To access further details and precise instructions, use the following command:
@@ -1332,8 +1332,8 @@ You can use the command as shown below:
 
 ```sh
 kubectl cnpg subscription sync-sequences \
-  --subscription <SUBSCRIPTION_NAME> \
-  <LOCAL_CLUSTER>
+  --subscription SUBSCRIPTION_NAME \
+  LOCAL_CLUSTER
 ```
 
 For comprehensive details and specific instructions, utilize the following
diff --git a/internal/cmd/plugin/logical/publication/create/cmd.go b/internal/cmd/plugin/logical/publication/create/cmd.go
index 966500911b..3e7847e682 100644
--- a/internal/cmd/plugin/logical/publication/create/cmd.go
+++ b/internal/cmd/plugin/logical/publication/create/cmd.go
@@ -38,7 +38,7 @@ func NewCmd() *cobra.Command {
 	var dryRun bool
 
 	publicationCreateCmd := &cobra.Command{
-		Use:  "create cluster_name",
+		Use:  "create CLUSTER",
 		Args: plugin.RequiresArguments(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return plugin.CompleteClusters(cmd.Context(), args, toComplete), cobra.ShellCompDirectiveNoFileComp
diff --git a/internal/cmd/plugin/logical/publication/drop/cmd.go b/internal/cmd/plugin/logical/publication/drop/cmd.go
index 6d27c7a955..b7d1166c5c 100644
--- a/internal/cmd/plugin/logical/publication/drop/cmd.go
+++ b/internal/cmd/plugin/logical/publication/drop/cmd.go
@@ -35,7 +35,7 @@ func NewCmd() *cobra.Command {
 	var dryRun bool
 
 	publicationDropCmd := &cobra.Command{
-		Use:  "drop cluster_name",
+		Use:  "drop CLUSTER",
 		Args: plugin.RequiresArguments(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return plugin.CompleteClusters(cmd.Context(), args, toComplete), cobra.ShellCompDirectiveNoFileComp
diff --git a/internal/cmd/plugin/logical/subscription/create/cmd.go b/internal/cmd/plugin/logical/subscription/create/cmd.go
index 9ca7508f9e..9c234d8ddc 100644
--- a/internal/cmd/plugin/logical/subscription/create/cmd.go
+++ b/internal/cmd/plugin/logical/subscription/create/cmd.go
@@ -37,7 +37,7 @@ func NewCmd() *cobra.Command {
 	var dryRun bool
 
 	subscriptionCreateCmd := &cobra.Command{
-		Use:   "create cluster_name",
+		Use:   "create CLUSTER",
 		Short: "create a logical replication subscription",
 		Args:  plugin.RequiresArguments(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
diff --git a/internal/cmd/plugin/logical/subscription/drop/cmd.go b/internal/cmd/plugin/logical/subscription/drop/cmd.go
index bba02c68bc..1ec557ad5f 100644
--- a/internal/cmd/plugin/logical/subscription/drop/cmd.go
+++ b/internal/cmd/plugin/logical/subscription/drop/cmd.go
@@ -34,7 +34,7 @@ func NewCmd() *cobra.Command {
 	var dryRun bool
 
 	subscriptionDropCmd := &cobra.Command{
-		Use:  "drop cluster_name",
+		Use:  "drop CLUSTER",
 		Args: plugin.RequiresArguments(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			return plugin.CompleteClusters(cmd.Context(), args, toComplete), cobra.ShellCompDirectiveNoFileComp
diff --git a/internal/cmd/plugin/logical/subscription/syncsequences/cmd.go b/internal/cmd/plugin/logical/subscription/syncsequences/cmd.go
index fbb6230794..c88f62d0ee 100644
--- a/internal/cmd/plugin/logical/subscription/syncsequences/cmd.go
+++ b/internal/cmd/plugin/logical/subscription/syncsequences/cmd.go
@@ -36,7 +36,7 @@ func NewCmd() *cobra.Command {
 	var offset int
 
 	syncSequencesCmd := &cobra.Command{
-		Use:   "sync-sequences cluster_name",
+		Use:   "sync-sequences CLUSTER",
 		Short: "synchronize the sequences from the source database",
 		Args:  plugin.RequiresArguments(1),
 		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
diff --git a/internal/cmd/plugin/logs/cluster.go b/internal/cmd/plugin/logs/cluster.go
index 0249ab9357..3ba9e7d4b2 100644
--- a/internal/cmd/plugin/logs/cluster.go
+++ b/internal/cmd/plugin/logs/cluster.go
@@ -26,7 +26,7 @@ func clusterCmd() *cobra.Command {
 	cl := clusterLogs{}
 
 	cmd := &cobra.Command{
-		Use:   "cluster <clusterName>",
+		Use:   "cluster CLUSTER",
 		Short: "Logs for cluster's pods",
 		Long:  "Collects the logs for all pods in a cluster into a single stream or outputFile",
 		Args:  plugin.RequiresArguments(1),
diff --git a/internal/cmd/plugin/pgbench/cmd.go b/internal/cmd/plugin/pgbench/cmd.go
index 394b238546..11260d37d1 100644
--- a/internal/cmd/plugin/pgbench/cmd.go
+++ b/internal/cmd/plugin/pgbench/cmd.go
@@ -47,14 +47,14 @@ func NewCmd() *cobra.Command {
 		&run.jobName,
 		"job-name",
 		"",
-		"Name of the job, defaulting to: <clusterName>-pgbench-xxxx",
+		"Name of the job, defaulting to: CLUSTER-pgbench-xxxx",
 	)
 
 	pgBenchCmd.Flags().StringVar(
 		&run.jobName,
 		"pgbench-job-name",
 		"",
-		"Name of the job, defaulting to: <clusterName>-pgbench-xxxx",
+		"Name of the job, defaulting to: CLUSTER-pgbench-xxxx",
 	)
 
 	pgBenchCmd.Flags().StringVar(
@@ -88,7 +88,7 @@ func validateCommandArgs(cmd *cobra.Command, args []string) error {
 	}
 
 	if cmd.ArgsLenAtDash() > 1 {
-		return fmt.Errorf("pgBenchCommands should be passed after the -- delimiter")
+		return fmt.Errorf("PGBENCH_COMMAND_ARGS should be passed after the -- delimiter")
 	}
 
 	return nil
diff --git a/internal/cmd/plugin/pgbench/pgbench.go b/internal/cmd/plugin/pgbench/pgbench.go
index a1b92eec4f..0887374219 100644
--- a/internal/cmd/plugin/pgbench/pgbench.go
+++ b/internal/cmd/plugin/pgbench/pgbench.go
@@ -47,17 +47,17 @@ const (
 )
 
 var jobExample = `
-  # Dry-run command with default values and clusterName "cluster-example"
+  # Dry-run command with default values and [cluster] "cluster-example"
   kubectl-cnpg pgbench cluster-example --dry-run
 
-  # Create a pgbench job with default values and clusterName "cluster-example"
+  # Create a pgbench job with default values and [cluster] "cluster-example"
   kubectl-cnpg pgbench cluster-example
 
-  # Dry-run command with given values and clusterName "cluster-example"
+  # Dry-run command with given values and [cluster] "cluster-example"
   kubectl-cnpg pgbench cluster-example --db-name pgbenchDBName --job-name job-name --dry-run -- \
     --time 30 --client 1 --jobs 1
 
-  # Create a job with given values and clusterName "cluster-example"
+  # Create a job with given values and [cluster] "cluster-example"
   kubectl-cnpg pgbench cluster-example --db-name pgbenchDBName --job-name job-name -- \
     --time 30 --client 1 --jobs 1`
 
diff --git a/internal/cmd/plugin/promote/cmd.go b/internal/cmd/plugin/promote/cmd.go
index 401e75d949..111c4291b0 100644
--- a/internal/cmd/plugin/promote/cmd.go
+++ b/internal/cmd/plugin/promote/cmd.go
@@ -30,7 +30,7 @@ import (
 func NewCmd() *cobra.Command {
 	promoteCmd := &cobra.Command{
 		Use:     "promote CLUSTER INSTANCE",
-		Short:   "Promote the pod named CLUSTER-INSTANCE to primary",
+		Short:   "Promote the instance named CLUSTER-INSTANCE to primary",
 		GroupID: plugin.GroupIDCluster,
 		Args:    plugin.RequiresArguments(2),
 		RunE: func(_ *cobra.Command, args []string) error {
diff --git a/internal/cmd/plugin/report/cluster.go b/internal/cmd/plugin/report/cluster.go
index 5e5920db37..fa76af6461 100644
--- a/internal/cmd/plugin/report/cluster.go
+++ b/internal/cmd/plugin/report/cluster.go
@@ -32,7 +32,7 @@ func clusterCmd() *cobra.Command {
 
 	const filePlaceholder = "report_cluster_<name>_<timestamp>.zip"
 	cmd := &cobra.Command{
-		Use:   "cluster <clusterName>",
+		Use:   "cluster CLUSTER",
 		Short: "Report cluster resources, pods, events, logs (opt-in)",
 		Long:  "Collects combined information on the cluster in a Zip file",
 		Args:  plugin.RequiresArguments(1),
diff --git a/internal/cmd/plugin/restart/cmd.go b/internal/cmd/plugin/restart/cmd.go
index c27b66a989..28ef5e31df 100644
--- a/internal/cmd/plugin/restart/cmd.go
+++ b/internal/cmd/plugin/restart/cmd.go
@@ -28,7 +28,7 @@ import (
 // NewCmd creates the new "reset" command
 func NewCmd() *cobra.Command {
 	restartCmd := &cobra.Command{
-		Use:   "restart clusterName [instance]",
+		Use:   "restart CLUSTER [INSTANCE]",
 		Short: `Restart a cluster or a single instance in a cluster`,
 		Long: `If only the cluster name is specified, the whole cluster will be restarted, 
 rolling out new configurations if present.
diff --git a/internal/cmd/plugin/snapshot/cmd.go b/internal/cmd/plugin/snapshot/cmd.go
index ed20dc669f..17039dcc7d 100644
--- a/internal/cmd/plugin/snapshot/cmd.go
+++ b/internal/cmd/plugin/snapshot/cmd.go
@@ -28,7 +28,7 @@ import (
 // NewCmd implements the `snapshot` subcommand
 func NewCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "snapshot <cluster-name>",
+		Use:     "snapshot CLUSTER",
 		Short:   "DEPRECATED (use `backup -m volumeSnapshot` instead)",
 		Long:    "Replaced by `kubectl cnpg backup <cluster-name> -m volumeSnapshot`",
 		GroupID: plugin.GroupIDDatabase,