diff --git a/clustertool/cmd/adv_bootstrap.go b/clustertool/cmd/adv_bootstrap.go
index b12df3a070b3..fed6f97776e4 100644
--- a/clustertool/cmd/adv_bootstrap.go
+++ b/clustertool/cmd/adv_bootstrap.go
@@ -1,13 +1,20 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
 )
 
+var advBootstrapLongHelp = strings.TrimSpace(`
+
+`)
+
 var bootstrap = &cobra.Command{
     Use:   "bootstrap",
     Short: "bootstrap first Talos Node",
+    Long:  advBootstrapLongHelp,
     Run:   bootstrapfunc,
 }
 
diff --git a/clustertool/cmd/adv_fluxbootstrap.go b/clustertool/cmd/adv_fluxbootstrap.go
deleted file mode 100644
index b8545f54ee40..000000000000
--- a/clustertool/cmd/adv_fluxbootstrap.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cmd
-
-import (
-    "context"
-
-    talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config"
-    "github.com/rs/zerolog/log"
-    "github.com/spf13/cobra"
-    "github.com/truecharts/public/clustertool/pkg/fluxhandler"
-    "github.com/truecharts/public/clustertool/pkg/helper"
-    "github.com/truecharts/public/clustertool/pkg/initfiles"
-    "github.com/truecharts/public/clustertool/pkg/sops"
-)
-
-var fluxbootstrap = &cobra.Command{
-    Use:   "fluxbootstrap",
-    Short: "Manually bootstrap fluxcd on existing cluster",
-    Run: func(cmd *cobra.Command, args []string) {
-        ctx := context.Background()
-
-        if err := sops.DecryptFiles(); err != nil {
-            log.Info().Msgf("Error decrypting files: %v\n", err)
-        }
-        initfiles.LoadTalEnv(false)
-        _, err := talhelperCfg.LoadAndValidateFromFile(helper.TalConfigFile, []string{helper.ClusterEnvFile}, false)
-        if err != nil {
-            log.Fatal().Err(err).Msg("failed to parse talconfig or talenv file: %s")
-        }
-
-        fluxhandler.FluxBootstrap(ctx)
-    },
-}
-
-func init() {
-    adv.AddCommand(fluxbootstrap)
-}
diff --git a/clustertool/cmd/adv_health.go b/clustertool/cmd/adv_health.go
index 0a5adca5e37b..d5e33d9af884 100644
--- a/clustertool/cmd/adv_health.go
+++ b/clustertool/cmd/adv_health.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
@@ -8,9 +10,14 @@ import (
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var advHealthLongHelp = strings.TrimSpace(`
+
+`)
+
 var health = &cobra.Command{
     Use:   "health",
     Short: "Check Talos Cluster Health",
+    Long:  advHealthLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         if err := sops.DecryptFiles(); err != nil {
             log.Info().Msgf("Error decrypting files: %v\n", err)
diff --git a/clustertool/cmd/adv_precommit.go b/clustertool/cmd/adv_precommit.go
index dd10efc69482..59dd3834a561 100644
--- a/clustertool/cmd/adv_precommit.go
+++ b/clustertool/cmd/adv_precommit.go
@@ -2,15 +2,21 @@ package cmd
 
 import (
     "os"
+    "strings"
 
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var advPrecommitLongHelp = strings.TrimSpace(`
+
+`)
+
 var precommit = &cobra.Command{
     Use:   "precommit",
     Short: "Runs the PreCommit encryption check",
+    Long:  advPrecommitLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         if err := sops.CheckFilesAndReportEncryption(true, true); err != nil {
             log.Info().Msgf("Error checking files: %v\n", err)
diff --git a/clustertool/cmd/adv_reset.go b/clustertool/cmd/adv_reset.go
index adf7db576c77..8e3ab4b39f9d 100644
--- a/clustertool/cmd/adv_reset.go
+++ b/clustertool/cmd/adv_reset.go
@@ -1,15 +1,22 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var advResetLongHelp = strings.TrimSpace(`
+
+`)
+
 var reset = &cobra.Command{
     Use:   "reset",
     Short: "Reset Talos Nodes and Kubernetes",
+    Long:  advResetLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         var extraArgs []string
         node := ""
diff --git a/clustertool/cmd/adv_testcmd.go b/clustertool/cmd/adv_testcmd.go
index 492ab0e56893..f9ca2ead05b8 100644
--- a/clustertool/cmd/adv_testcmd.go
+++ b/clustertool/cmd/adv_testcmd.go
@@ -1,15 +1,22 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
     "github.com/truecharts/public/clustertool/pkg/initfiles"
 )
 
+var advTestCmdlongHelp = strings.TrimSpace(`
+
+`)
+
 var testcmd = &cobra.Command{
     Use:   "test",
     Short: "test run",
+    Long:  advTestCmdlongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         initfiles.LoadTalEnv(false)
         // err := fluxhandler.ProcessJSONFiles("./testdata/truenas_exports")
diff --git a/clustertool/cmd/apply.go b/clustertool/cmd/apply.go
index de40f1b0e743..936eecc57f88 100644
--- a/clustertool/cmd/apply.go
+++ b/clustertool/cmd/apply.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
@@ -9,9 +11,14 @@ import (
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var applyLongHelp = strings.TrimSpace(`
+
+`)
+
 var apply = &cobra.Command{
     Use:   "apply",
     Short: "apply TalosConfig",
+    Long:  applyLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         var extraArgs []string
         node := ""
diff --git a/clustertool/cmd/charts_bump.go b/clustertool/cmd/charts_bump.go
index 257caea14d92..347f377a0db2 100644
--- a/clustertool/cmd/charts_bump.go
+++ b/clustertool/cmd/charts_bump.go
@@ -1,14 +1,21 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/charts/version"
 )
 
+var chartsBumpLongHelp = strings.TrimSpace(`
+
+`)
+
 var bumper = &cobra.Command{
     Use:     "bump",
     Short:   "generate a bumped image version",
+    Long:    chartsBumpLongHelp,
     Example: "charttool bump <version> <kind>",
     Args:    cobra.ExactArgs(2),
     Run: func(cmd *cobra.Command, args []string) {
diff --git a/clustertool/cmd/charts_deps.go b/clustertool/cmd/charts_deps.go
index ea1be3525406..892d9648631c 100644
--- a/clustertool/cmd/charts_deps.go
+++ b/clustertool/cmd/charts_deps.go
@@ -1,15 +1,22 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/charts/deps"
     "github.com/truecharts/public/clustertool/pkg/helper"
 )
 
+var chartsDepsLongHelp = strings.TrimSpace(`
+
+`)
+
 var depsCmd = &cobra.Command{
     Use:     "deps",
     Short:   "Download, Update and Verify Helm dependencies",
+    Long:    chartsDepsLongHelp,
     Example: "charttool deps <chart> <chart> <chart>",
     Run: func(cmd *cobra.Command, args []string) {
         if err := deps.LoadGPGKey(); err != nil {
diff --git a/clustertool/cmd/charts_genchangelog.go b/clustertool/cmd/charts_genchangelog.go
index 84a1b57e89f2..51188db80796 100644
--- a/clustertool/cmd/charts_genchangelog.go
+++ b/clustertool/cmd/charts_genchangelog.go
@@ -1,15 +1,22 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
 
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/charts/changelog"
 )
 
+var chartsGenChangelogLongHelp = strings.TrimSpace(`
+
+`)
+
 var genChangelogCmd = &cobra.Command{
     Use:     "genchangelog",
     Short:   "Generate changelog for charts",
+    Long:    chartsGenChangelogLongHelp,
     Example: "charttool genchangelog <repo path> <template path> <charts dir>",
     Run: func(cmd *cobra.Command, args []string) {
         if len(args) < 3 {
diff --git a/clustertool/cmd/charts_genchartlist.go b/clustertool/cmd/charts_genchartlist.go
index 2a2c1c05a4e5..a68b136b791e 100644
--- a/clustertool/cmd/charts_genchartlist.go
+++ b/clustertool/cmd/charts_genchartlist.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
 
     "github.com/spf13/cobra"
@@ -8,9 +10,14 @@ import (
     "github.com/truecharts/public/clustertool/pkg/helper"
 )
 
+var chartsGenChartsListLongHelp = strings.TrimSpace(`
+
+`)
+
 var genChartListCmd = &cobra.Command{
     Use:     "genchartlist",
     Short:   "Generate chart list json file",
+    Long:    chartsGenChartsListLongHelp,
     Example: "charttool genchartlist <path to charts folder>",
     Run: func(cmd *cobra.Command, args []string) {
         opts := &website.ChartListOptions{
diff --git a/clustertool/cmd/charts_genmeta.go b/clustertool/cmd/charts_genmeta.go
index 4f320e1b4652..0d8878ec12de 100644
--- a/clustertool/cmd/charts_genmeta.go
+++ b/clustertool/cmd/charts_genmeta.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
 
     "slices"
@@ -10,9 +12,14 @@ import (
     "github.com/truecharts/public/clustertool/pkg/helper"
 )
 
+var chartsGenMetaLongHelp = strings.TrimSpace(`
+
+`)
+
 var genMetaCmd = &cobra.Command{
     Use:   "genmeta",
     Short: "Generate and update Chart.yaml metadata",
+    Long:  chartsGenMetaLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         bump := ""
         if len(args) > 0 && slices.Contains([]string{"patch", "minor", "major"}, args[0]) {
diff --git a/clustertool/cmd/charts_tagclean.go b/clustertool/cmd/charts_tagclean.go
index b33f425d391f..524b912f938c 100644
--- a/clustertool/cmd/charts_tagclean.go
+++ b/clustertool/cmd/charts_tagclean.go
@@ -1,15 +1,22 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
 
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/charts/image"
 )
 
+var chartsTagCleanLongHelp = strings.TrimSpace(`
+
+`)
+
 var tagCleaner = &cobra.Command{
     Use:     "tagcleaner",
     Short:   "Creates a clean version tag from a container digest",
+    Long:    chartsTagCleanLongHelp,
     Example: "charttool tagcleaner <tag>",
     Args:    cobra.ExactArgs(1),
     Run: func(cmd *cobra.Command, args []string) {
diff --git a/clustertool/cmd/checkcrypt.go b/clustertool/cmd/checkcrypt.go
index be41f8f750d5..56fee92a88bf 100644
--- a/clustertool/cmd/checkcrypt.go
+++ b/clustertool/cmd/checkcrypt.go
@@ -2,15 +2,21 @@ package cmd
 
 import (
     "os"
+    "strings"
 
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var checkcyptLongHelp = strings.TrimSpace(`
+
+`)
+
 var checkcrypt = &cobra.Command{
     Use:   "checkcrypt",
     Short: "Checks if all files are encrypted correctly in accordance with .sops.yaml",
+    Long:  checkcyptLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         if err := sops.CheckFilesAndReportEncryption(false, false); err != nil {
             log.Info().Msgf("Error checking files: %v\n", err)
diff --git a/clustertool/cmd/decrypt.go b/clustertool/cmd/decrypt.go
index 48f46d0083c0..ddbcfe66275c 100644
--- a/clustertool/cmd/decrypt.go
+++ b/clustertool/cmd/decrypt.go
@@ -1,14 +1,21 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var decryptLongHelp = strings.TrimSpace(`
+
+`)
+
 var decrypt = &cobra.Command{
     Use:   "decrypt",
     Short: "Decrypt all high-risk data using sops",
+    Long:  decryptLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         if err := sops.DecryptFiles(); err != nil {
             log.Info().Msgf("Error decrypting files: %v\n", err)
diff --git a/clustertool/cmd/encrypt.go b/clustertool/cmd/encrypt.go
index 385b9a3645f0..872aa3b2ae08 100644
--- a/clustertool/cmd/encrypt.go
+++ b/clustertool/cmd/encrypt.go
@@ -1,14 +1,21 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var encryptLongHelp = strings.TrimSpace(`
+
+`)
+
 var encrypt = &cobra.Command{
     Use:   "encrypt",
     Short: "Encrypt all high-risk data using sops",
+    Long:  encryptLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         if err := sops.EncryptAllFiles(); err != nil {
             log.Info().Msgf("Error encrypting files: %v\n", err)
diff --git a/clustertool/cmd/fluxbootstrap.go b/clustertool/cmd/fluxbootstrap.go
index 404af5705873..3b8859404504 100644
--- a/clustertool/cmd/fluxbootstrap.go
+++ b/clustertool/cmd/fluxbootstrap.go
@@ -1,14 +1,42 @@
 package cmd
 
 import (
+    "context"
+    "strings"
+
+    talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config"
+    "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
+    "github.com/truecharts/public/clustertool/pkg/fluxhandler"
+    "github.com/truecharts/public/clustertool/pkg/helper"
+    "github.com/truecharts/public/clustertool/pkg/initfiles"
+    "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
-var fluxBootstrap = &cobra.Command{
-    Use:   "fluxBootstrap",
-    Short: "bootstrapFluxCD",
+var fluxBootstrapLongHelp = strings.TrimSpace(`
+
+`)
+
+var fluxbootstrap = &cobra.Command{
+    Use:   "fluxbootstrap",
+    Short: "Manually bootstrap fluxcd on existing cluster",
+    Long:  fluxBootstrapLongHelp,
+    Run: func(cmd *cobra.Command, args []string) {
+        ctx := context.Background()
+
+        if err := sops.DecryptFiles(); err != nil {
+            log.Info().Msgf("Error decrypting files: %v\n", err)
+        }
+        initfiles.LoadTalEnv(false)
+        _, err := talhelperCfg.LoadAndValidateFromFile(helper.TalConfigFile, []string{helper.ClusterEnvFile}, false)
+        if err != nil {
+            log.Fatal().Err(err).Msg("failed to parse talconfig or talenv file: %s")
+        }
+
+        fluxhandler.FluxBootstrap(ctx)
+    },
 }
 
 func init() {
-    RootCmd.AddCommand(fluxBootstrap)
+    RootCmd.AddCommand(fluxbootstrap)
 }
diff --git a/clustertool/cmd/helmrelease_install.go b/clustertool/cmd/helmrelease_install.go
index 27fcb5c9432c..f59d78c6f312 100644
--- a/clustertool/cmd/helmrelease_install.go
+++ b/clustertool/cmd/helmrelease_install.go
@@ -2,15 +2,21 @@ package cmd
 
 import (
     "path/filepath"
+    "strings"
 
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/fluxhandler"
     "github.com/truecharts/public/clustertool/pkg/initfiles"
 )
 
+var hrInstalLongHelp = strings.TrimSpace(`
+
+`)
+
 var hrinstall = &cobra.Command{
     Use:   "install",
     Short: "install a helm-release file without flux, helm-release file needs to be called helm-release.yaml",
+    Long:  hrInstalLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         initfiles.LoadTalEnv(false)
 
diff --git a/clustertool/cmd/helmrelease_upgrade.go b/clustertool/cmd/helmrelease_upgrade.go
index 5c52d0c79f38..0e4e174d43ce 100644
--- a/clustertool/cmd/helmrelease_upgrade.go
+++ b/clustertool/cmd/helmrelease_upgrade.go
@@ -2,15 +2,21 @@ package cmd
 
 import (
     "path/filepath"
+    "strings"
 
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/fluxhandler"
     "github.com/truecharts/public/clustertool/pkg/initfiles"
 )
 
+var hrUpgradeLongHelp = strings.TrimSpace(`
+
+`)
+
 var hrupgrade = &cobra.Command{
     Use:   "upgrade",
     Short: "run helm-upgrade using a helm-release file without flux",
+    Long:  hrUpgradeLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         initfiles.LoadTalEnv(false)
 
diff --git a/clustertool/cmd/info.go b/clustertool/cmd/info.go
index 44874f08a2a8..20675f29307a 100644
--- a/clustertool/cmd/info.go
+++ b/clustertool/cmd/info.go
@@ -1,13 +1,20 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/info"
 )
 
+var infoLongHelp = strings.TrimSpace(`
+
+`)
+
 var infoCmd = &cobra.Command{
     Use:     "info",
     Short:   "Prints information about the clustertool binary",
+    Long:    infoLongHelp,
     Example: "clustertool info",
     Run: func(cmd *cobra.Command, args []string) {
         info.NewInfo().Print()
diff --git a/clustertool/cmd/scale_export.go b/clustertool/cmd/scale_export.go
index 56febf418849..1eb5d271adf1 100644
--- a/clustertool/cmd/scale_export.go
+++ b/clustertool/cmd/scale_export.go
@@ -1,13 +1,20 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/scale"
 )
 
+var scaleExportLongHelp = strings.TrimSpace(`
+
+`)
+
 var scaleexport = &cobra.Command{
     Use:   "export",
     Short: "Export SCALE Apps to file",
+    Long:  scaleExportLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         scale.ExportApps()
     },
diff --git a/clustertool/cmd/scale_migrate.go b/clustertool/cmd/scale_migrate.go
index 672b4430178d..abe54fbe555b 100644
--- a/clustertool/cmd/scale_migrate.go
+++ b/clustertool/cmd/scale_migrate.go
@@ -1,14 +1,21 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/scale"
 )
 
+var scaleMigrateLongHelp = strings.TrimSpace(`
+
+`)
+
 var scalemigrate = &cobra.Command{
     Use:   "migrate",
     Short: "Migrate exported SCALE Apps to the Talos Cluster",
+    Long:  scaleMigrateLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         err := scale.ProcessJSONFiles("./truenas_exports")
         if err != nil {
diff --git a/clustertool/cmd/upgrade.go b/clustertool/cmd/upgrade.go
index ae0aad0f50b3..9201d75b464a 100644
--- a/clustertool/cmd/upgrade.go
+++ b/clustertool/cmd/upgrade.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+    "strings"
+
     "github.com/rs/zerolog/log"
     "github.com/spf13/cobra"
     "github.com/truecharts/public/clustertool/pkg/gencmd"
@@ -8,9 +10,14 @@ import (
     "github.com/truecharts/public/clustertool/pkg/sops"
 )
 
+var upgradeLongHelp = strings.TrimSpace(`
+
+`)
+
 var upgrade = &cobra.Command{
     Use:   "upgrade",
     Short: "Upgrade Talos Nodes and Kubernetes",
+    Long:  upgradeLongHelp,
     Run: func(cmd *cobra.Command, args []string) {
         var extraArgs []string
         node := ""