diff --git a/src/ui/HelmSnippet/CLISnippet.tsx b/src/ui/HelmSnippet/CLISnippet.tsx
index d42c2778e..9c40533e9 100644
--- a/src/ui/HelmSnippet/CLISnippet.tsx
+++ b/src/ui/HelmSnippet/CLISnippet.tsx
@@ -13,13 +13,13 @@ EOF
 
 {{/if}}
 {{#if this.createRepo }}
-helm repo add {{{ this.chart }}} {{{ this.repoName }}}/{{{ this.chart }}}
+helm repo add {{{ this.repoName }}} {{{ this.chartUrl }}}
 {{/if}}
 {{#if this.updateHelmRepo }}
 helm repo update
 {{/if}}
 
-helm install {{{ this.releaseName }}} {{{ this.repoName }}}/{{{ this.chart }}} -n "{{{ this.namespace }}}" \\
+helm install {{{ this.chart }}} {{{ this.repoName }}}/{{{ this.chart }}} -n "{{{ this.namespace }}}" \\
   {{#each this.values}}
   --set {{{ this.key }}}={{{ this.value }}} {{#unless @last}} \\ \n{{/unless}}{{/each}}{{#if this.createNamespace }} \\
   --create-namespace {{#if this.valueFile }} \\ {{/if}}
diff --git a/src/ui/HelmSnippet/FluxSnippet.tsx b/src/ui/HelmSnippet/FluxSnippet.tsx
index 871943fd5..08d92d297 100644
--- a/src/ui/HelmSnippet/FluxSnippet.tsx
+++ b/src/ui/HelmSnippet/FluxSnippet.tsx
@@ -14,7 +14,7 @@ metadata:
 ---
 {{/if}}
 {{#if this.createRepo}}
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: {{ this.repoName }}
@@ -24,7 +24,7 @@ spec:
   url: {{{ this.chartUrl }}}
 ---
 {{/if}}
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: {{{ this.chart }}}