diff --git a/commands/netobserv b/commands/netobserv
index cd66205d..bcb78b5f 100755
--- a/commands/netobserv
+++ b/commands/netobserv
@@ -1,8 +1,10 @@
 #!/bin/bash
 source "./scripts/functions.sh"
+source "./scripts/help.sh"
 source "./scripts/dependencies_check.sh"
 
 set +u
+
 # e2e skips inputs
 if [ -z "${isE2E+x}" ]; then isE2E=false; fi
 # keep capture state
@@ -46,7 +48,22 @@ maxTime="5m"
 # max bytes (default: 50MB)
 maxBytes=50000000
 
-function flows() {
+if [[ ! "$*" =~ ^(.*)help|version(.*) ]]; then
+  required_yq_version="v0.0.0"
+  supported_archs=""
+  check_dependencies "$required_yq_version" "$supported_archs"
+fi
+
+case "$1" in
+*help)
+  help
+  exit 0
+  ;;
+*version)
+  version "$version"
+  exit 0
+  ;;
+*flows)
   case "$2" in
   "help")
     flows_usage
@@ -59,9 +76,8 @@ function flows() {
     command="flows"
     ;;
   esac
-}
-
-function packets() {
+  ;;
+*packets)
   case "$2" in
   "help")
     packets_usage
@@ -74,9 +90,8 @@ function packets() {
     command="packets"
     ;;
   esac
-}
-
-function metrics() {
+  ;;
+*metrics)
   case "$2" in
   "help")
     metrics_usage
@@ -89,74 +104,58 @@ function metrics() {
     command="metrics"
     ;;
   esac
-}
-
-if [[ ! "$*" =~ ^(.*)help|version(.*) ]]; then
-  required_yq_version="v0.0.0"
-  supported_archs=""
-  check_dependencies "$required_yq_version" "$supported_archs"
-fi
-
-case "$1" in
-"help")
-  # display Help
-  echo
-  echo "Netobserv allows you to capture flow, packets and metrics from your cluster."
-  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
-  echo
-  echo "Syntax: netobserv [flows|packets|metrics|follow|stop|copy|cleanup|version] [options]"
-  echo
-  echo "commands:"
-  echo "  flows      Capture flows information in JSON format using collector pod."
-  echo "        Options:"
-  flows_usage
-  echo "  packets    Capture packets information in pcap format using collector pod."
-  echo "        Options:"
-  packets_usage
-  echo "  metrics    Capture metrics information in Prometheus using a ServiceMonitor (OCP cluster only)."
-  echo "        Options:"
-  metrics_usage
-  echo "  follow     Follow collector logs when running in background."
-  echo "  stop       Stop collection by removing agent daemonset."
-  echo "  copy       Copy collector generated files locally."
-  echo "  cleanup    Remove netobserv components and configurations."
-  echo "  version    Print software version."
-  echo
-  exit 0
   ;;
-"version")
-  # display version
-  echo "Netobserv CLI version $version"
-  exit 0
-  ;;
-"flows")
-  flows $*
-  ;;
-"packets")
-  packets $*
-  ;;
-"metrics")
-  metrics $*
-  ;;
-"follow")
-  # run follow command
-  follow
-  exit 0
+*follow)
+  case "$2" in
+  "help")
+    follow_usage
+    exit 0
+    ;;
+  *)
+    # run follow command
+    follow
+    exit 0
+    ;;
+  esac
   ;;
-"stop")
-  # run deleteDaemonset command
-  deleteDaemonset
-  exit 0
+*stop)
+  case "$2" in
+  "help")
+    stop_usage
+    exit 0
+    ;;
+  *)
+    # run deleteDaemonset command
+    deleteDaemonset
+    exit 0
+    ;;
+  esac
   ;;
-"copy")
-  # run copy output command
-  copyOutput
-  exit 0
+*copy)
+  case "$2" in
+  "help")
+    copy_usage
+    exit 0
+    ;;
+  *)
+    # run copy output command
+    copyOutput
+    exit 0
+    ;;
+  esac
   ;;
-"cleanup")
-  # run cleanup command
-  cleanup
-  exit 0
+*cleanup)
+  case "$2" in
+  "help")
+    cleanup_usage
+    exit 0
+    ;;
+  *)
+    # run cleanup command
+    cleanup
+    exit 0
+    ;;
+  esac
   ;;
 *)
   echo "Unknown command $1. Use 'netobserv help' to display options"
diff --git a/docs/netobserv_cli.adoc b/docs/netobserv_cli.adoc
index b26348b4..2f0e54ea 100644
--- a/docs/netobserv_cli.adoc
+++ b/docs/netobserv_cli.adoc
@@ -1,9 +1,12 @@
 // Automatically generated by './scripts/generate-doc.sh'. Do not edit, or make the NETOBSERV team aware of the editions.
 :_mod-docs-content-type: REFERENCE
+
 [id="network-observability-cli-usage_{context}"]
 = Network Observability CLI usage
 
-You can use the The Network Observability CLI (`oc netobserv`) to pass command line arguments to capture flow data and packet data for further analysis, enable Network Observability Operator features or pass configuration options to the eBPF agent and flowlogs-pipeline.
+You can use the The Network Observability CLI (`oc netobserv`) to pass command line arguments to capture flows data and packets data for further analysis, enable Network Observability Operator features or pass configuration options to the eBPF agent and `flowlogs-pipeline`.
+
+[id=cli-syntax_{context}]
 == Syntax 
 The basic syntax for `oc netobserv` commands: 
 
@@ -14,15 +17,24 @@ $ oc netobserv [<command>] [<feature_option>] [<command_options>] <1>
 ----
 <1> Feature options can only be used with the `oc netobserv flows` command. They cannot be used with the `oc netobserv packets` command.
 
+[id=cli-basic-commands_{context}]
 == Basic commands
 [cols="3a,8a",options="header"]
 .Basic commands
 |===
 | Command | Description
 | flows
-| Capture flows information. For subcommands, see the "Flow capture subcommands" table.
+| Capture flows information. For subcommands, see the "Flows capture options" table.
 | packets
-| Capture packets data. For subcommands, see the "Packet capture subcommand" table.
+| Capture packets data. For subcommands, see the "Packets capture options" table.
+| metrics
+| Capture metrics data. For subcommands, see the "Metrics capture options" table.
+| follow
+| Follow collector logs when running in background.
+| stop
+| Stop collection by removing agent daemonset.
+| copy
+| Copy collector generated files locally.
 | cleanup
 | Remove the Network Observability CLI components.
 | version
@@ -31,8 +43,10 @@ $ oc netobserv [<command>] [<feature_option>] [<command_options>] <1>
 | Show help.
 |===
 
+[id=cli-reference-flows-capture-options_{context}]
 == Flows capture options
-Flow capture has mandatory commands as well as additional options, such as enabling extra features about packet drops, DNS latencies, Round-trip time, and filtering.
+flows capture has mandatory commands as well as additional options, such as enabling extra features about packet drops, DNS latencies, Round-trip time, and filtering.
+
 .`oc netobserv flows` syntax
 [source,terminal]
 ----
@@ -52,7 +66,6 @@ $ oc netobserv flows [<feature_option>] [<command_options>]
 |--background|            run in background                          | false
 |--copy|                  copy the output files locally              | prompt
 |--node-selector|         capture on specific nodes                  | n/a
-|--enable_filter|         enable flow filter                         | false
 |--direction|             filter direction                           | n/a
 |--cidr|                  filter CIDR                                | 0.0.0.0/0
 |--protocol|              filter protocol                            | n/a
@@ -71,17 +84,19 @@ $ oc netobserv flows [<feature_option>] [<command_options>]
 |--icmp_code|             filter ICMP code                           | n/a
 |--peer_ip|               filter peer IP                             | n/a
 |--drops|                 filter flows with only dropped packets     | false
-|--regexes|               filter flows using regex                   | n/a
+|--regexes|               filter flows using regular expression      | n/a
 |--interfaces|            interfaces to monitor                      | n/a
 |===
 
-.Example running flow capture on TCP protocol and port 49051 with PacketDrop and RTT features enabled:
+.Example running flows capture on TCP protocol and port 49051 with PacketDrop and RTT features enabled:
 [source,terminal]
 ----
 $ oc netobserv flows --enable_pktdrop=true  --enable_rtt=true --enable_filter=true --action=Accept --cidr=0.0.0.0/0 --protocol=TCP --port=49051
 ----
+[id=cli-reference-packet-capture-options_{context}]
 == Packets capture options
-You can filter packet capture data as same as flow capture using the filters. However, the features are not available here.
+You can filter packets capture data as same as flows capture using the filters.
+Note that the features, such as packets drop, dns, rtt, and network events, are only available for flows and metrics capture.
 
 .`oc netobserv packets` syntax
 [source,terminal]
@@ -97,7 +112,6 @@ $ oc netobserv packets [<option>]
 |--background|            run in background                          | false
 |--copy|                  copy the output files locally              | prompt
 |--node-selector|         capture on specific nodes                  | n/a
-|--enable_filter|         enable flow filter                         | false
 |--direction|             filter direction                           | n/a
 |--cidr|                  filter CIDR                                | 0.0.0.0/0
 |--protocol|              filter protocol                            | n/a
@@ -116,16 +130,17 @@ $ oc netobserv packets [<option>]
 |--icmp_code|             filter ICMP code                           | n/a
 |--peer_ip|               filter peer IP                             | n/a
 |--drops|                 filter flows with only dropped packets     | false
-|--regexes|               filter flows using regex                   | n/a
+|--regexes|               filter flows using regular expression      | n/a
 |===
 
-.Example running packet capture on TCP protocol and port 49051:
+.Example running packets capture on TCP protocol and port 49051:
 [source,terminal]
 ----
 $ oc netobserv packets --action=Accept --cidr=0.0.0.0/0 --protocol=TCP --port=49051
 ----
+[id=cli-reference-metrics-capture-options_{context}]
 == Metrics capture options
-You can enable features and use filters on metrics capture as same as flow capture. The generated graphs will fill accordingly.
+You can enable features and use filters on metrics capture, the same as flows capture. The generated graphs fill accordingly in the dashboard.
 
 .`oc netobserv metrics` syntax
 [source,terminal]
@@ -141,7 +156,6 @@ $ oc netobserv metrics [<option>]
 |--enable_network_events| enable Network events monitoring           | false
 |--get-subnets|           get subnets informations                   | false
 |--node-selector|         capture on specific nodes                  | n/a
-|--enable_filter|         enable flow filter                         | false
 |--direction|             filter direction                           | n/a
 |--cidr|                  filter CIDR                                | 0.0.0.0/0
 |--protocol|              filter protocol                            | n/a
@@ -160,7 +174,7 @@ $ oc netobserv metrics [<option>]
 |--icmp_code|             filter ICMP code                           | n/a
 |--peer_ip|               filter peer IP                             | n/a
 |--drops|                 filter flows with only dropped packets     | false
-|--regexes|               filter flows using regex                   | n/a
+|--regexes|               filter flows using regular expression      | n/a
 |--interfaces|            interfaces to monitor                      | n/a
 |===
 
diff --git a/scripts/functions.sh b/scripts/functions.sh
index 8bb09990..0a87c342 100755
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -352,72 +352,6 @@ function cleanup {
   fi
 }
 
-function features_usage {
-  # agent / flp features
-  echo "          --enable_pktdrop:         enable packet drop                         (default: false)"
-  echo "          --enable_dns:             enable DNS tracking                        (default: false)"
-  echo "          --enable_rtt:             enable RTT tracking                        (default: false)"
-  echo "          --enable_network_events:  enable Network events monitoring           (default: false)"
-  echo "          --get-subnets:            get subnets informations                   (default: false)"
-}
-
-function collector_usage {
-  # collector options
-  echo "          --log-level:              components logs                            (default: info)"
-  echo "          --max-time:               maximum capture time                       (default: 5m)"
-  echo "          --max-bytes:              maximum capture bytes                      (default: 50000000 = 50MB)"
-  echo "          --background:             run in background                          (default: false)"
-  echo "          --copy:                   copy the output files locally              (default: prompt)"
-}
-
-function filters_usage {
-  # agent node selector
-  echo "          --node-selector:          capture on specific nodes                  (default: n/a)"
-  # agent filters
-  echo "          --direction:              filter direction                           (default: n/a)"
-  echo "          --cidr:                   filter CIDR                                (default: 0.0.0.0/0)"
-  echo "          --protocol:               filter protocol                            (default: n/a)"
-  echo "          --sport:                  filter source port                         (default: n/a)"
-  echo "          --dport:                  filter destination port                    (default: n/a)"
-  echo "          --port:                   filter port                                (default: n/a)"
-  echo "          --sport_range:            filter source port range                   (default: n/a)"
-  echo "          --dport_range:            filter destination port range              (default: n/a)"
-  echo "          --port_range:             filter port range                          (default: n/a)"
-  echo "          --sports:                 filter on either of two source ports       (default: n/a)"
-  echo "          --dports:                 filter on either of two destination ports  (default: n/a)"
-  echo "          --ports:                  filter on either of two ports              (default: n/a)"
-  echo "          --tcp_flags:              filter TCP flags                           (default: n/a)"
-  echo "          --action:                 filter action                              (default: Accept)"
-  echo "          --icmp_type:              filter ICMP type                           (default: n/a)"
-  echo "          --icmp_code:              filter ICMP code                           (default: n/a)"
-  echo "          --peer_ip:                filter peer IP                             (default: n/a)"
-  echo "          --drops:                  filter flows with only dropped packets     (default: false)"
-  echo "          --regexes:                filter flows using regex                   (default: n/a)"
-}
-
-function specific_filters_usage {
-  # specific filters
-  echo "          --interfaces:             interfaces to monitor                      (default: n/a)"
-}
-
-function flows_usage {
-  features_usage
-  collector_usage
-  filters_usage
-  specific_filters_usage
-}
-
-function packets_usage {
-  collector_usage
-  filters_usage
-}
-
-function metrics_usage {
-  features_usage
-  filters_usage
-  specific_filters_usage
-}
-
 # get current config and save it to temp file
 function copyFLPConfig {
   jsonContent=$("$YQ_BIN" e '.spec.template.spec.containers[0].env[] | select(.name=="FLP_CONFIG").value' "$1")
@@ -646,7 +580,7 @@ function check_args_and_apply() {
     or) # Increment flow filter array
       edit_manifest "add_filter" "" "$2"
       ;;
-    --background) # Run command in background
+    *background) # Run command in background
       defaultValue "true"
       if [[ "$value" == "true" || "$value" == "false" ]]; then
         runBackground="$value"
@@ -654,7 +588,7 @@ function check_args_and_apply() {
         echo "invalid value for --background"
       fi
       ;;
-    --copy) # Copy or skip without prompt
+    *copy) # Copy or skip without prompt
       defaultValue "true"
       if [[ "$value" == "true" || "$value" == "false" || "$value" == "prompt" ]]; then
         copy="$value"
@@ -662,10 +596,10 @@ function check_args_and_apply() {
         echo "invalid value for --copy"
       fi
       ;;
-    --interfaces) # Interfaces
+    *interfaces) # Interfaces
       edit_manifest "interfaces" "$value" "$2"
       ;;
-    --enable_pktdrop) # Enable packet drop
+    *enable_pktdrop) # Enable packet drop
       if [[ "$3" == "flows" || "$3" == "metrics" ]]; then
         defaultValue "true"
         if [[ "$value" == "true" || "$value" == "false" ]]; then
@@ -678,7 +612,7 @@ function check_args_and_apply() {
         exit 1
       fi
       ;;
-    --enable_dns) # Enable DNS
+    *enable_dns) # Enable DNS
       if [[ "$3" == "flows" || "$3" == "metrics" ]]; then
         defaultValue "true"
         if [[ "$value" == "true" || "$value" == "false" ]]; then
@@ -691,7 +625,7 @@ function check_args_and_apply() {
         exit 1
       fi
       ;;
-    --enable_rtt) # Enable RTT
+    *enable_rtt) # Enable RTT
       if [[ "$3" == "flows" || "$3" == "metrics" ]]; then
         defaultValue "true"
         if [[ "$value" == "true" || "$value" == "false" ]]; then
@@ -704,7 +638,7 @@ function check_args_and_apply() {
         exit 1
       fi
       ;;
-    --enable_network_events) # Enable Network events monitoring
+    *enable_network_events) # Enable Network events monitoring
       if [[ "$3" == "flows" || "$3" == "metrics" ]]; then
         defaultValue "true"
         if [[ "$value" == "true" || "$value" == "false" ]]; then
@@ -717,58 +651,58 @@ function check_args_and_apply() {
         exit 1
       fi
       ;;
-    --direction) # Configure filter direction
+    *direction) # Configure filter direction
       if [[ "$value" == "Ingress" || "$value" == "Egress" ]]; then
         edit_manifest "filter_direction" "$value" "$2"
       else
         echo "invalid value for --direction"
       fi
       ;;
-    --cidr) # Configure flow CIDR
+    *cidr) # Configure flow CIDR
       edit_manifest "filter_cidr" "$value" "$2"
       ;;
-    --protocol) # Configure filter protocol
+    *protocol) # Configure filter protocol
       if [[ "$value" == "TCP" || "$value" == "UDP" || "$value" == "SCTP" || "$value" == "ICMP" || "$value" == "ICMPv6" ]]; then
         edit_manifest "filter_protocol" "$value" "$2"
       else
         echo "invalid value for --protocol"
       fi
       ;;
-    --sport) # Configure filter source port
+    *sport) # Configure filter source port
       edit_manifest "filter_sport" "$value" "$2"
       ;;
-    --dport) # Configure filter destination port
+    *dport) # Configure filter destination port
       edit_manifest "filter_dport" "$value" "$2"
       ;;
-    --port) # Configure filter port
+    *port) # Configure filter port
       edit_manifest "filter_port" "$value" "$2"
       ;;
-    --sport_range) # Configure filter source port range
+    *sport_range) # Configure filter source port range
       edit_manifest "filter_sport_range" "$value" "$2"
       ;;
-    --dport_range) # Configure filter destination port range
+    *dport_range) # Configure filter destination port range
       edit_manifest "filter_dport_range" "$value" "$2"
       ;;
-    --port_range) # Configure filter port range
+    *port_range) # Configure filter port range
       edit_manifest "filter_port_range" "$value" "$2"
       ;;
-    --sports) # Configure filter source two ports using ","
+    *sports) # Configure filter source two ports using ","
       edit_manifest "filter_sports" "$value" "$2"
       ;;
-    --dports) # Configure filter destination two ports using ","
+    *dports) # Configure filter destination two ports using ","
       edit_manifest "filter_dports" "$value" "$2"
       ;;
-    --ports) # Configure filter on two ports usig "," can either be srcport or dstport
+    *ports) # Configure filter on two ports usig "," can either be srcport or dstport
       edit_manifest "filter_ports" "$value" "$2"
       ;;
-    --tcp_flags) # Configure filter TCP flags
+    *tcp_flags) # Configure filter TCP flags
       if [[ "$value" == "SYN" || "$value" == "SYN-ACK" || "$value" == "ACK" || "$value" == "FIN" || "$value" == "RST" || "$value" == "FIN-ACK" || "$value" == "RST-ACK" || "$value" == "PSH" || "$value" == "URG" || "$value" == "ECE" || "$value" == "CWR" ]]; then
         edit_manifest "filter_tcp_flags" "$value" "$2"
       else
         echo "invalid value for --tcp_flags"
       fi
       ;;
-    --drops) # Filter packet drops
+    *drops) # Filter packet drops
       defaultValue "true"
       if [[ "$value" == "true" || "$value" == "false" ]]; then
         edit_manifest "filter_pkt_drops" "$value" "$2"
@@ -776,7 +710,7 @@ function check_args_and_apply() {
         echo "invalid value for --drops"
       fi
       ;;
-    --regexes) # Filter using regexes
+    *regexes) # Filter using regexes
       valueCount=$(grep -o "~" <<<"$value" | wc -l)
       splitterCount=$(grep -o "," <<<"$value" | wc -l)
       if [[ ${valueCount} -gt 0 && $((valueCount)) == $((splitterCount + 1)) ]]; then
@@ -785,23 +719,23 @@ function check_args_and_apply() {
         echo "invalid value for --regexes"
       fi
       ;;
-    --icmp_type) # ICMP type
+    *icmp_type) # ICMP type
       edit_manifest "filter_icmp_type" "$value" "$2"
       ;;
-    --icmp_code) # ICMP code
+    *icmp_code) # ICMP code
       edit_manifest "filter_icmp_code" "$value" "$2"
       ;;
-    --peer_ip) # Peer IP
+    *peer_ip) # Peer IP
       edit_manifest "filter_peer_ip" "$value" "$2"
       ;;
-    --action) # Filter action
+    *action) # Filter action
       if [[ "$value" == "Accept" || "$value" == "Reject" ]]; then
         edit_manifest "filter_action" "$value" "$2"
       else
         echo "invalid value for --action"
       fi
       ;;
-    --log-level) # Log level
+    *log-level) # Log level
       if [[ "$value" == "trace" || "$value" == "debug" || "$value" == "info" || "$value" == "warn" || "$value" == "error" || "$value" == "fatal" || "$value" == "panic" ]]; then
         edit_manifest "log_level" "$value" "$2"
         logLevel=$value
@@ -810,15 +744,15 @@ function check_args_and_apply() {
         echo "invalid value for --action"
       fi
       ;;
-    --max-time) # Max time
+    *max-time) # Max time
       maxTime=$value
       filter=${filter/$key=$maxTime/}
       ;;
-    --max-bytes) # Max bytes
+    *max-bytes) # Max bytes
       maxBytes=$value
       filter=${filter/$key=$maxBytes/}
       ;;
-    --node-selector) # Node selector
+    *node-selector) # Node selector
       if [[ $value == *":"* ]]; then
         edit_manifest "node_selector" "$value" "$2"
       else
@@ -826,7 +760,7 @@ function check_args_and_apply() {
         exit 1
       fi
       ;;
-    --get-subnets) # Get subnets
+    *get-subnets) # Get subnets
       defaultValue "true"
       if [[ "$value" == "true" || "$value" == "false" ]]; then
         edit_manifest "get_subnets" "$value" "$2"
diff --git a/scripts/generate-doc.sh b/scripts/generate-doc.sh
index bbeaa5c2..32e31d82 100755
--- a/scripts/generate-doc.sh
+++ b/scripts/generate-doc.sh
@@ -1,13 +1,19 @@
 #!/bin/bash
+
+source "./scripts/help.sh"
+
 ADOC=./docs/netobserv_cli.adoc
 
 # Header
 echo "// Automatically generated by '$0'. Do not edit, or make the NETOBSERV team aware of the editions.
 :_mod-docs-content-type: REFERENCE
+
 [id=\"network-observability-cli-usage_{context}\"]
 = Network Observability CLI usage
 
-You can use the The Network Observability CLI (\`oc netobserv\`) to pass command line arguments to capture flow data and packet data for further analysis, enable Network Observability Operator features or pass configuration options to the eBPF agent and flowlogs-pipeline.
+You can use the The Network Observability CLI (\`oc netobserv\`) to pass command line arguments to capture flows data and packets data for further analysis, enable Network Observability Operator features or pass configuration options to the eBPF agent and \`flowlogs-pipeline\`.
+
+[id="cli-syntax_{context}"]
 == Syntax 
 The basic syntax for \`oc netobserv\` commands: 
 
@@ -18,15 +24,24 @@ $ oc netobserv [<command>] [<feature_option>] [<command_options>] <1>
 ----
 <1> Feature options can only be used with the \`oc netobserv flows\` command. They cannot be used with the \`oc netobserv packets\` command.
 
+[id="cli-basic-commands_{context}"]
 == Basic commands
 [cols=\"3a,8a\",options=\"header\"]
 .Basic commands
 |===
 | Command | Description
 | flows
-| Capture flows information. For subcommands, see the \"Flow capture subcommands\" table.
+| Capture flows information. For subcommands, see the \"Flows capture options\" table.
 | packets
-| Capture packets data. For subcommands, see the \"Packet capture subcommand\" table.
+| Capture packets data. For subcommands, see the \"Packets capture options\" table.
+| metrics
+| Capture metrics data. For subcommands, see the \"Metrics capture options\" table.
+| follow
+| Follow collector logs when running in background.
+| stop
+| Stop collection by removing agent daemonset.
+| copy
+| Copy collector generated files locally.
 | cleanup
 | Remove the Network Observability CLI components.
 | version
@@ -36,10 +51,12 @@ $ oc netobserv [<command>] [<feature_option>] [<command_options>] <1>
 |===
 " > $ADOC
 
-# Flow table
+# flows table
 {
-echo "== Flows capture options
-Flow capture has mandatory commands as well as additional options, such as enabling extra features about packet drops, DNS latencies, Round-trip time, and filtering.
+echo "[id="cli-reference-flows-capture-options_{context}"]
+== Flows capture options
+flows capture has mandatory commands as well as additional options, such as enabling extra features about packet drops, DNS latencies, Round-trip time, and filtering.
+
 .\`oc netobserv flows\` syntax
 [source,terminal]
 ----
@@ -48,19 +65,24 @@ $ oc netobserv flows [<feature_option>] [<command_options>]
 [cols=\"1,1,1\",options=\"header\"]
 |===
 | Option | Description | Default"
-./build/oc-netobserv flows help
+features_usage
+collector_usage
+filters_usage
+specific_filters_usage
 echo -e "|==="
-# Flow example
+# flows example
 echo "
-.Example running flow capture on TCP protocol and port 49051 with PacketDrop and RTT features enabled:
+.Example running flows capture on TCP protocol and port 49051 with PacketDrop and RTT features enabled:
 [source,terminal]
 ----
 $ oc netobserv flows --enable_pktdrop=true  --enable_rtt=true --enable_filter=true --action=Accept --cidr=0.0.0.0/0 --protocol=TCP --port=49051
 ----"
 
-# Packet table
-echo "== Packets capture options
-You can filter packet capture data as same as flow capture using the filters. However, the features are not available here.
+# packets table
+echo "[id="cli-reference-packet-capture-options_{context}"]
+== Packets capture options
+You can filter packets capture data as same as flows capture using the filters.
+Note that the features, such as packets drop, dns, rtt, and network events, are only available for flows and metrics capture.
 
 .\`oc netobserv packets\` syntax
 [source,terminal]
@@ -70,19 +92,21 @@ $ oc netobserv packets [<option>]
 [cols=\"1,1,1\",options=\"header\"]
 |===
 | Option | Description | Default"
-./build/oc-netobserv packets help
+collector_usage
+filters_usage
 echo -e "|==="
-# Packet example
+# packets example
 echo "
-.Example running packet capture on TCP protocol and port 49051:
+.Example running packets capture on TCP protocol and port 49051:
 [source,terminal]
 ----
 $ oc netobserv packets --action=Accept --cidr=0.0.0.0/0 --protocol=TCP --port=49051
 ----"
 
 # Metrics table
-echo "== Metrics capture options
-You can enable features and use filters on metrics capture as same as flow capture. The generated graphs will fill accordingly in the dashboard.
+echo "[id="cli-reference-metrics-capture-options_{context}"]
+== Metrics capture options
+You can enable features and use filters on metrics capture, the same as flows capture. The generated graphs fill accordingly in the dashboard.
 
 .\`oc netobserv metrics\` syntax
 [source,terminal]
@@ -92,7 +116,9 @@ $ oc netobserv metrics [<option>]
 [cols=\"1,1,1\",options=\"header\"]
 |===
 | Option | Description | Default"
-./build/oc-netobserv metrics help
+features_usage
+filters_usage
+specific_filters_usage
 echo -e "|==="
 # Metrics example
 echo "
diff --git a/scripts/help.sh b/scripts/help.sh
new file mode 100644
index 00000000..28b49c70
--- /dev/null
+++ b/scripts/help.sh
@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+
+# display main help
+function help {
+  echo
+  echo "Netobserv allows you to capture flows, packets and metrics from your cluster."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv [flows|packets|metrics|follow|stop|copy|cleanup|version] [options]"
+  echo
+  echo "commands:"
+  echo "  flows      Capture flows information in JSON format using collector pod."
+  echo "  packets    Capture packets information in pcap format using collector pod."
+  echo "  metrics    Capture metrics information in Prometheus using a ServiceMonitor (OCP cluster only)."
+  echo "  follow     Follow collector logs when running in background."
+  echo "  stop       Stop collection by removing agent daemonset."
+  echo "  copy       Copy collector generated files locally."
+  echo "  cleanup    Remove netobserv components and configurations."
+  echo "  version    Print software version."
+  echo
+}
+
+# display version
+function version {
+  echo "Netobserv CLI version $1"
+}
+
+# agent / flp features
+function features_usage {
+  echo "  --enable_pktdrop:         enable packet drop                         (default: false)"
+  echo "  --enable_dns:             enable DNS tracking                        (default: false)"
+  echo "  --enable_rtt:             enable RTT tracking                        (default: false)"
+  echo "  --enable_network_events:  enable Network events monitoring           (default: false)"
+  echo "  --get-subnets:            get subnets informations                   (default: false)"
+}
+
+# collector options
+function collector_usage {
+  echo "  --log-level:              components logs                            (default: info)"
+  echo "  --max-time:               maximum capture time                       (default: 5m)"
+  echo "  --max-bytes:              maximum capture bytes                      (default: 50000000 = 50MB)"
+  echo "  --background:             run in background                          (default: false)"
+  echo "  --copy:                   copy the output files locally              (default: prompt)"
+}
+
+# agent selector / filters
+function filters_usage {
+  # node selector
+  echo "  --node-selector:          capture on specific nodes                  (default: n/a)"
+  # filters
+  echo "  --direction:              filter direction                           (default: n/a)"
+  echo "  --cidr:                   filter CIDR                                (default: 0.0.0.0/0)"
+  echo "  --protocol:               filter protocol                            (default: n/a)"
+  echo "  --sport:                  filter source port                         (default: n/a)"
+  echo "  --dport:                  filter destination port                    (default: n/a)"
+  echo "  --port:                   filter port                                (default: n/a)"
+  echo "  --sport_range:            filter source port range                   (default: n/a)"
+  echo "  --dport_range:            filter destination port range              (default: n/a)"
+  echo "  --port_range:             filter port range                          (default: n/a)"
+  echo "  --sports:                 filter on either of two source ports       (default: n/a)"
+  echo "  --dports:                 filter on either of two destination ports  (default: n/a)"
+  echo "  --ports:                  filter on either of two ports              (default: n/a)"
+  echo "  --tcp_flags:              filter TCP flags                           (default: n/a)"
+  echo "  --action:                 filter action                              (default: Accept)"
+  echo "  --icmp_type:              filter ICMP type                           (default: n/a)"
+  echo "  --icmp_code:              filter ICMP code                           (default: n/a)"
+  echo "  --peer_ip:                filter peer IP                             (default: n/a)"
+  echo "  --drops:                  filter flows with only dropped packets     (default: false)"
+  echo "  --regexes:                filter flows using regular expression      (default: n/a)"
+}
+
+function specific_filters_usage {
+  # specific filters
+  echo "  --interfaces:             interfaces to monitor                      (default: n/a)"
+}
+
+function flows_usage {
+  echo
+  echo "Netobserv allows you to capture flows from your cluster."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv flows [options]"
+  echo
+  echo "features:"
+  features_usage
+  echo
+  echo "options:"
+  collector_usage
+  echo
+  echo "filters:"
+  filters_usage
+  specific_filters_usage
+}
+
+function packets_usage {
+  echo
+  echo "Netobserv allows you to capture packets from your cluster."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv packets [options]"
+  echo
+  echo "options:"
+  collector_usage
+  echo
+  echo "filters:"
+  filters_usage
+}
+
+function metrics_usage {
+  echo
+  echo "Netobserv allows you to capture metrics on your OCP cluster."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv metrics [options]"
+  echo
+  echo "features:"
+  features_usage
+  echo
+  echo "filters:"
+  filters_usage
+  specific_filters_usage
+}
+
+function follow_usage {
+  echo
+  echo "Netobserv allows you to capture flows and packets asyncronously using the --background option."
+  echo "While the capture is running in background, you can connect to the collector pod to see the progression using the follow command."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv follow"
+  echo
+}
+
+function stop_usage {
+  echo
+  echo "Netobserv allows you stop the collection and keep collector or dashboard for post analysis."
+  echo "While the capture is running, use the stop command to remove the eBPF agents."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv stop"
+  echo
+}
+
+function copy_usage {
+  echo
+  echo "Netobserv allows you copy locally the captured flows or packets from the collector pod."
+  echo "While the collector is running, use the copy command to copy the output file(s)."
+  echo "To avoid modifications during the copy, it's recommended to stop the capture"
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv copy"
+  echo
+}
+
+function cleanup_usage {
+  echo
+  echo "Netobserv may require manual cleanup in some cases such as after a background run or in case of failure."
+  echo "Use the cleanup command to remove all the netobserv CLI components."
+  echo "Find more information at: https://github.com/netobserv/network-observability-cli/"
+  echo
+  echo "Syntax: netobserv cleanup"
+  echo
+}
diff --git a/scripts/inject.sh b/scripts/inject.sh
index ee4e62ee..670d72cc 100755
--- a/scripts/inject.sh
+++ b/scripts/inject.sh
@@ -3,6 +3,7 @@ set -x
 
 cp -a ./commands/. ./tmp
 cp ./scripts/functions.sh ./tmp/functions.sh
+cp ./scripts/help.sh ./tmp/help.sh
 cp ./scripts/dependencies_check.sh ./tmp/dependencies_check.sh
 
 if [ -z "$IMAGE" ]; then
@@ -101,6 +102,11 @@ sed -i.bak '/^source "\.\/scripts\/functions\.sh"/{r ./tmp/functions.sh
 d
 }' ./tmp/"$prefix"netobserv
 
+# inject help to commands
+sed -i.bak '/^source "\.\/scripts\/help\.sh"/{r ./tmp/help.sh
+d
+}' ./tmp/"$prefix"netobserv
+
 # inject updated dependencies_check to commands
 sed -i.bak '/^source "\.\/scripts\/dependencies_check\.sh"/{r ./tmp/dependencies_check.sh
 d
@@ -114,6 +120,7 @@ else
 fi
 
 rm ./tmp/functions.sh
+rm ./tmp/help.sh
 rm ./tmp/dependencies_check.sh
 rm ./tmp/*.bak
 
@@ -124,4 +131,3 @@ else
   cp -a ./tmp/. ./"$DIST_DIR"
   rm -rf ./tmp
 fi
-