diff --git a/akamai-github/templates/mgmt/components/kubefirst/console.yaml b/akamai-github/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/akamai-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/akamai-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/akamai-github/templates/mgmt/components/kubefirst/wait.yaml b/akamai-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/akamai-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/akamai-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/aws-github/templates/mgmt/components/kubefirst/console.yaml b/aws-github/templates/mgmt/components/kubefirst/console.yaml
index 9150f50c7..22406fac2 100644
--- a/aws-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/aws-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,21 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-          serviceAccount:
-            create: true
-            annotations:
-              eks.amazonaws.com/role-arn: arn:aws:iam::<AWS_ACCOUNT_ID>:role/kubefirst-api-<CLUSTER_NAME>
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/aws-github/templates/mgmt/components/kubefirst/wait.yaml b/aws-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/aws-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/aws-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml b/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml
index 9150f50c7..22406fac2 100644
--- a/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/aws-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,21 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-          serviceAccount:
-            create: true
-            annotations:
-              eks.amazonaws.com/role-arn: arn:aws:iam::<AWS_ACCOUNT_ID>:role/kubefirst-api-<CLUSTER_NAME>
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/aws-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/civo-github/templates/mgmt/components/kubefirst/console.yaml b/civo-github/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/civo-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/civo-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/civo-github/templates/mgmt/components/kubefirst/wait.yaml b/civo-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/civo-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/civo-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml b/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/civo-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/civo-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml b/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/digitalocean-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml b/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/digitalocean-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml b/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/digitalocean-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/digitalocean-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/google-github/templates/mgmt/components/kubefirst/console.yaml b/google-github/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/google-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/google-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/google-github/templates/mgmt/components/kubefirst/wait.yaml b/google-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/google-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/google-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/google-gitlab/templates/mgmt/components/kubefirst/console.yaml b/google-gitlab/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/google-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/google-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/google-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml b/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml
index 88572a98b..b0e398cfa 100644
--- a/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml
+++ b/k3d-github/cluster-types/mgmt/components/kubefirst/console-arm.yaml
@@ -9,7 +9,7 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
+    targetRevision: 2.6.2-rc24
     chart: kubefirst
     helm:
       values: |-
diff --git a/k3d-github/cluster-types/mgmt/components/kubefirst/console.yaml b/k3d-github/cluster-types/mgmt/components/kubefirst/console.yaml
index 88572a98b..0b310dfbb 100644
--- a/k3d-github/cluster-types/mgmt/components/kubefirst/console.yaml
+++ b/k3d-github/cluster-types/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnv:
             DISABLE_AUTH: "true"
@@ -48,6 +41,12 @@ spec:
               key: client_secret
           ingress:
             enabled: "true"
+            className: nginx
+            annotations:
+              <CERT_MANAGER_ISSUER_ANNOTATION_1>
+              <CERT_MANAGER_ISSUER_ANNOTATION_2>
+              <CERT_MANAGER_ISSUER_ANNOTATION_3>
+              <CERT_MANAGER_ISSUER_ANNOTATION_4>
             hosts:
               - host: kubefirst.<DOMAIN_NAME>
                 paths:
@@ -58,7 +57,7 @@ spec:
                 hosts:
                   - kubefirst.<DOMAIN_NAME>
   destination:
-    server: https://kubernetes.default.svc
+    name: in-cluster
     namespace: kubefirst
   syncPolicy:
     automated:
diff --git a/k3d-github/cluster-types/mgmt/components/kubefirst/wait.yaml b/k3d-github/cluster-types/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/k3d-github/cluster-types/mgmt/components/kubefirst/wait.yaml
+++ b/k3d-github/cluster-types/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console-arm.yaml b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console-arm.yaml
index 88572a98b..b0e398cfa 100644
--- a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console-arm.yaml
+++ b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console-arm.yaml
@@ -9,7 +9,7 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
+    targetRevision: 2.6.2-rc24
     chart: kubefirst
     helm:
       values: |-
diff --git a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console.yaml b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console.yaml
index 88572a98b..0b310dfbb 100644
--- a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console.yaml
+++ b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnv:
             DISABLE_AUTH: "true"
@@ -48,6 +41,12 @@ spec:
               key: client_secret
           ingress:
             enabled: "true"
+            className: nginx
+            annotations:
+              <CERT_MANAGER_ISSUER_ANNOTATION_1>
+              <CERT_MANAGER_ISSUER_ANNOTATION_2>
+              <CERT_MANAGER_ISSUER_ANNOTATION_3>
+              <CERT_MANAGER_ISSUER_ANNOTATION_4>
             hosts:
               - host: kubefirst.<DOMAIN_NAME>
                 paths:
@@ -58,7 +57,7 @@ spec:
                 hosts:
                   - kubefirst.<DOMAIN_NAME>
   destination:
-    server: https://kubernetes.default.svc
+    name: in-cluster
     namespace: kubefirst
   syncPolicy:
     automated:
diff --git a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/wait.yaml b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/k3d-gitlab/cluster-types/mgmt/components/kubefirst/wait.yaml
+++ b/k3d-gitlab/cluster-types/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/k3s-github/templates/mgmt/components/kubefirst/console.yaml b/k3s-github/templates/mgmt/components/kubefirst/console.yaml
index 0cff46b68..22406fac2 100644
--- a/k3s-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/k3s-github/templates/mgmt/components/kubefirst/console.yaml
@@ -4,17 +4,16 @@ metadata:
   name: kubefirst
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: '10'
+    argocd.argoproj.io/sync-wave: "10"
 spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
-          kubefirstVersion: "<KUBEFIRST_VERSION>"
           cloudProvider: "<CLOUD_PROVIDER>"
           clusterId: "<CLUSTER_ID>"
           clusterType: "<CLUSTER_TYPE>"
@@ -24,21 +23,12 @@ spec:
           kubefirstClient: "<KUBEFIRST_CLIENT>"
           kubefirstTeam: "<KUBEFIRST_TEAM>"
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
+          kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
-          env:
-            - name: IN_CLUSTER
-              value: "'true'"
-        kubefirst-api:
-          env:
-            - name: IN_CLUSTER
-              value: "'true'"
-            - name: CLUSTER_NAME
-              value: "<CLUSTER_NAME>"
-            - name: ENTERPRISE_API_URL
-              value: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "'false'"
+        kubefirst-pro-api:
+          extraEnv:
+            CLUSTER_NAME: "<CLUSTER_NAME>"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/k3s-github/templates/mgmt/components/kubefirst/wait.yaml b/k3s-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/k3s-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/k3s-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/k3s-gitlab/templates/mgmt/components/kubefirst/console.yaml b/k3s-gitlab/templates/mgmt/components/kubefirst/console.yaml
index 0cff46b68..22406fac2 100644
--- a/k3s-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/k3s-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -4,17 +4,16 @@ metadata:
   name: kubefirst
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: '10'
+    argocd.argoproj.io/sync-wave: "10"
 spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
-          kubefirstVersion: "<KUBEFIRST_VERSION>"
           cloudProvider: "<CLOUD_PROVIDER>"
           clusterId: "<CLUSTER_ID>"
           clusterType: "<CLUSTER_TYPE>"
@@ -24,21 +23,12 @@ spec:
           kubefirstClient: "<KUBEFIRST_CLIENT>"
           kubefirstTeam: "<KUBEFIRST_TEAM>"
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
+          kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
-          env:
-            - name: IN_CLUSTER
-              value: "'true'"
-        kubefirst-api:
-          env:
-            - name: IN_CLUSTER
-              value: "'true'"
-            - name: CLUSTER_NAME
-              value: "<CLUSTER_NAME>"
-            - name: ENTERPRISE_API_URL
-              value: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "'false'"
+        kubefirst-pro-api:
+          extraEnv:
+            CLUSTER_NAME: "<CLUSTER_NAME>"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/k3s-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/k3s-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/k3s-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/k3s-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/vultr-github/templates/mgmt/components/kubefirst/console.yaml b/vultr-github/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/vultr-github/templates/mgmt/components/kubefirst/console.yaml
+++ b/vultr-github/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/vultr-github/templates/mgmt/components/kubefirst/wait.yaml b/vultr-github/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/vultr-github/templates/mgmt/components/kubefirst/wait.yaml
+++ b/vultr-github/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait
diff --git a/vultr-gitlab/templates/mgmt/components/kubefirst/console.yaml b/vultr-gitlab/templates/mgmt/components/kubefirst/console.yaml
index bad7a3c2b..22406fac2 100644
--- a/vultr-gitlab/templates/mgmt/components/kubefirst/console.yaml
+++ b/vultr-gitlab/templates/mgmt/components/kubefirst/console.yaml
@@ -9,8 +9,8 @@ spec:
   project: default
   source:
     repoURL: https://charts.konstruct.io
-    targetRevision: 2.6.2-rc7
-    chart: kubefirst
+    targetRevision: 2.6.2-rc24
+    chart: kubefirst-pro
     helm:
       values: |-
         global:
@@ -25,17 +25,10 @@ spec:
           kubefirstTeamInfo: "<KUBEFIRST_TEAM_INFO>"
           kubefirstVersion: "<KUBEFIRST_VERSION>"
           useTelemetry: "<USE_TELEMETRY>"
-        kubefirst-api-ee:
+        kubefirst-pro-api:
           extraEnv:
-            IN_CLUSTER: "true"
-        kubefirst-api:
-          isClusterZero: "false"
-          extraEnv:
-            IN_CLUSTER: "true"
             CLUSTER_NAME: "<CLUSTER_NAME>"
-            ENTERPRISE_API_URL: "http://kubefirst-kubefirst-api-ee.kubefirst.svc.cluster.local"
-        console:
-          isClusterZero: "false"
+        kubefirst-pro-ui:
           domain: "<DOMAIN_NAME>"
           extraEnvSecrets:
             CLIENT_ID:
diff --git a/vultr-gitlab/templates/mgmt/components/kubefirst/wait.yaml b/vultr-gitlab/templates/mgmt/components/kubefirst/wait.yaml
index 2ca1ed176..1c5197946 100644
--- a/vultr-gitlab/templates/mgmt/components/kubefirst/wait.yaml
+++ b/vultr-gitlab/templates/mgmt/components/kubefirst/wait.yaml
@@ -51,7 +51,7 @@ spec:
             - --namespace
             - kubefirst
             - --label
-            - app.kubernetes.io/name=console
+            - app.kubernetes.io/name=kubefirst-pro-ui
           image: public.ecr.aws/kubefirst/kubernetes-toolkit:0.0.8
           imagePullPolicy: IfNotPresent
           name: wait