diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml
new file mode 100644
index 000000000..6d4f335f4
--- /dev/null
+++ b/.github/workflows/chart-release.yaml
@@ -0,0 +1,112 @@
+name: Release Helm charts - main
+
+on:
+  push:
+    branches:
+      - main
+      - enterprise-chart
+    paths:
+      - 'charts/testkube-cloud-api/templates/**'
+      - 'charts/testkube-cloud-api/Chart.yaml'
+      - 'charts/testkube-cloud-api/values.yaml'
+      - 'charts/testkube-cloud-api/README.md'
+      - 'charts/testkube-cloud-ui/templates/**'
+      - 'charts/testkube-cloud-ui/Chart.yaml'
+      - 'charts/testkube-cloud-ui/values.yaml'
+      - 'charts/testkube-cloud-ui/README.md'
+      - 'charts/testkube-enterprise/templates/**'
+      - 'charts/testkube-enterprise/Chart.yaml'
+      - 'charts/testkube-enterprise/values.yaml'
+      - 'charts/testkube-enterprise/README.md'
+      - '.github/workflows/chart-release.yaml'
+
+jobs:
+  release-helm-charts:
+    name: Release Helm charts
+    runs-on: ubuntu-22.04
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "testkube-cloud-ci-bot"
+          git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.10.0
+
+      - name: Update Helm chart with changes files
+        run: |
+          echo "Testkube Helm charts diff"
+          changed_files=$(git --no-pager diff HEAD~1 charts)
+
+          if [[ "$changed_files" == *"testkube-cloud-api/"* ]]; then
+            echo "Changes detected in files within the 'testkube-cloud-api' directory. Updating the chart minor version."
+            ./scripts/update.sh -c testkube-cloud-api --strategy minor
+          else
+            echo "No changes detected in the specified directories."
+          fi
+
+          if [[ "$changed_files" == *"testkube-cloud-ui/"* ]]; then
+            echo "Changes detected in files within the 'testkube-cloud-ui' directory. Updating the chart minor version."
+            ./scripts/update.sh -c testkube-cloud-ui --strategy minor
+          else
+            echo "No changes detected in the specified directories."
+          fi
+
+          tk_api_chart_version=$(./scripts/update.sh -c testkube-cloud-api --print-chart-version)
+          echo "New testkube-cloud-api chart version is $tk_api_chart_version" >> $GITHUB_STEP_SUMMARY
+          echo "API_CHART_VERSION=$tk_api_chart_version" >> $GITHUB_ENV
+
+          tk_ui_chart_version=$(./scripts/update.sh -c testkube-cloud-ui --print-chart-version)
+          echo "New testkube-cloud-ui chart version is $tk_ui_chart_version" >> $GITHUB_STEP_SUMMARY
+          echo "UI_CHART_VERSION=$tk_ui_chart_version" >> $GITHUB_ENV
+
+      - name: Sync & Update Testkube Enterprise Helm chart
+        run: |
+          bump_strategy="minor"
+          changed=$(git status --porcelain charts/testkube-enterprise | wc -l)
+          if [ $changed -gt 0 ]; then
+            bump_strategy="none"
+          fi
+
+          echo "Syncing subchart versions in testkube-enterprise Helm chart"
+          ./scripts/sync.sh
+
+          echo "Updating testkube-enterprise Helm chart version with bump strategy: $bump_strategy"
+          ./scripts/update.sh -c testkube-enterprise -s $bump_strategy --verbose
+
+          enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version)
+          echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV
+
+          echo -e "### Testkube Enterprise Helm chart diff" >> $GITHUB_STEP_SUMMARY
+          echo -e '```' >> $GITHUB_STEP_SUMMARY
+          git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY
+          echo -e '```' >> $GITHUB_STEP_SUMMARY
+
+      - name: Commit & push changes
+        run: |
+          git status
+          git add **/*Chart.yaml **/*README.md charts/testkube-enterprise/Chart.lock
+          git commit -m "updating testkube-enterprise chart version to ${{ env.ENTERPRISE_CHART_VERSION }}"
+          git push --force
+
+      - name: Installing repositories
+        run: |
+          helm repo add dex https://charts.dexidp.io
+          helm repo add nats https://nats-io.github.io/k8s/helm/charts/
+          helm repo add bitnami https://charts.bitnami.com/bitnami
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.6.0
+        with:
+          charts_dir: charts
+        env:
+          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CR_SKIP_EXISTING: true
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8ccc3ae7a..2bb77f984 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -50,7 +50,7 @@ jobs:
           python-version: 3.9
 
       - name: Setup Chart Linting
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.5.0
         with:
           # Note: Also update in scripts/lint.sh
           version: v3.7.1
diff --git a/.github/workflows/release-dispatch-main.yaml b/.github/workflows/release-dispatch-main.yaml
index 2253155ed..a1def2253 100644
--- a/.github/workflows/release-dispatch-main.yaml
+++ b/.github/workflows/release-dispatch-main.yaml
@@ -15,146 +15,146 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: main
-
-      - name: Install yq
-        uses: mikefarah/yq@v4
-
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-
-      - name: Update Helm chart
-        run: |
-          git config --global user.name "testkube-cloud-ci-bot"
-          git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
-
-          # update application version
-          ./scripts/update.sh                                \
-            -c ${{ github.event.client_payload.app }}        \
-            -a ${{ github.event.client_payload.appVersion }} \
-            --verbose
-
-          echo -e "### ${{ github.event.client_payload.app }} Helm chart diff" >> $GITHUB_STEP_SUMMARY
-          echo -e '```' >> $GITHUB_STEP_SUMMARY
-          git --no-pager diff >> $GITHUB_STEP_SUMMARY
-          echo -e '```' >> $GITHUB_STEP_SUMMARY
-
-          # update helm chart version
-          new_chart_version=$(./scripts/update.sh -c ${{ github.event.client_payload.app }} --print-chart-version)
-          echo "CHART_VERSION=$new_chart_version" >> $GITHUB_ENV
-
-      - name: Update Testkube Enterprise Helm chart
-        run: |
-          echo "Syncing subchart versions in testkube-enterprise Helm chart"
-          ./scripts/sync.sh
-
-          echo "Bumping testkube-enterprise Helm-chart version"
-          ./scripts/update.sh -c testkube-enterprise --strategy patch
-
-          enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version)
-          echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV
-
-      - name: Lint Helm charts for safety
-        run: |
-          helm lint charts/testkube-cloud-ui
-          helm lint charts/testkube-cloud-api
-          helm lint charts/testkube-enterprise
-
-      - name: Install Helm Docs
-        uses: envoy/install-helm-docs@v1.0.0
-        with:
-          version: 1.11.0
-
-      - name: Update Helm Docs
-        run: |
-          set -ex
-          helm-docs
-
-      - name: Add a release asset
-        run: |
-          if [[ "${{ github.event.client_payload.app }}" == "testkube-cloud-api" ]]; then
-            release_asset="testkube-cloud-api"
-            asset_chart_version=$(./scripts/update.sh -c testkube-cloud-api --print-chart-version)
-            echo "RELEASE_ASSET=$release_asset" >> $GITHUB_ENV
-            echo "ASSET_CHART_VERSION=$asset_chart_version" >> $GITHUB_ENV
-
-            helm package charts/testkube-cloud-api --destination archives
-
-          elif [[ "${{ github.event.client_payload.app }}" == "testkube-cloud-ui" ]]; then
-            release_asset="testkube-cloud-ui"
-            asset_chart_version=$(./scripts/update.sh -c testkube-cloud-ui --print-chart-version)
-            echo "RELEASE_ASSET=$release_asset" >> $GITHUB_ENV
-            echo "ASSET_CHART_VERSION=$asset_chart_version" >> $GITHUB_ENV
-
-            helm package charts/testkube-cloud-ui --destination archives
-
-          else
-            echo "Unknown app: ${{ github.event.client_payload.app }}"
-            exit 1
-          fi
-
-      - name: Package charts & update Helm repo index
-        run: |
-          echo "Packaging ${{ github.event.client_payload.app }} chart"
-          helm package charts/testkube-cloud-api --destination archives
-
-          echo "Packaging testkube-enterprise chart"
-          helm package charts/testkube-enterprise --destination archives
-
-          helm repo index .
-
-      - name: Commit & push changes
-        run: |
-          git add **/*Chart.yaml **/*README.md **/*values.yaml archives/*.tgz
-          git commit -m "updating chart ${{ github.event.client_payload.app }} version to "${{ env.CHART_VERSION }}" and appVersion to ${{ github.event.client_payload.appVersion }}; Updating testkube-enterprise chart version to ${{ env.ENTERPRISE_CHART_VERSION }}."
-          git push
-
-      - name: Bump version and push tag
-        id: tag
-        uses: anothrNick/github-tag-action@1.64.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: true
-          DEFAULT_BUMP: patch
-
-      - name: Changelog
-        uses: scottbrenner/generate-changelog-action@master
-        id: changelog
-
-      - name: Create a GitHub release for the app
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.tag.outputs.new_tag }}
-          name: ${{ steps.tag.outputs.new_tag }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          artifacts: |
-            archives/${{ github.event.client_payload.app }}-${{ env.CHART_VERSION }}.tgz
-            archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz
-            archives/${{ env.RELEASE_ASSET }}-${{ env.ASSET_CHART_VERSION }}.tgz
-
-      - name: Release to Keygen
-        uses: getgrit/keygen-action@main
-        with:
-          # Required: Keygen Account ID or slug
-          account-id: "${{ secrets.KEYGEN_ACCOUNT_ID }}"
-          # Required: A Product or User Token (ref. https://keygen.sh/docs/api/authentication/#token-authentication)
-          token: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_TOKEN }}"
-          # Required: Product ID
-          product-id: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_ID }}"
-          # Required (boolean): true to publish the created release; false to keep it in the DRAFT state.
-          release-publish: true
-          # Optional
-          release-name: 'Testkube Enterprise v${{ env.ENTERPRISE_CHART_VERSION }}'
-          # Required: must be a valid semver value, without the `v` prefix
-          release-version: '${{ env.ENTERPRISE_CHART_VERSION }}'
-          # Required
-          release-channel: 'stable'
-          # Optional
-          release-tag: 'latest'
-          artifacts-json: |
-            [
-              {
-                "filepath": "./archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz",
-                "platform": "linux",
-                "arch": "amd64"
-              }
-            ]
+#
+#      - name: Install yq
+#        uses: mikefarah/yq@v4
+#
+#      - name: Install Helm
+#        uses: azure/setup-helm@v3
+#
+#      - name: Update Helm chart
+#        run: |
+#          git config --global user.name "testkube-cloud-ci-bot"
+#          git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
+#
+#          # update application version
+#          ./scripts/update.sh                                \
+#            -c ${{ github.event.client_payload.app }}        \
+#            -a ${{ github.event.client_payload.appVersion }} \
+#            --verbose
+#
+#          echo -e "### ${{ github.event.client_payload.app }} Helm chart diff" >> $GITHUB_STEP_SUMMARY
+#          echo -e '```' >> $GITHUB_STEP_SUMMARY
+#          git --no-pager diff >> $GITHUB_STEP_SUMMARY
+#          echo -e '```' >> $GITHUB_STEP_SUMMARY
+#
+#          # update helm chart version
+#          new_chart_version=$(./scripts/update.sh -c ${{ github.event.client_payload.app }} --print-chart-version)
+#          echo "CHART_VERSION=$new_chart_version" >> $GITHUB_ENV
+#
+#      - name: Update Testkube Enterprise Helm chart
+#        run: |
+#          echo "Syncing subchart versions in testkube-enterprise Helm chart"
+#          ./scripts/sync.sh
+#
+#          echo "Bumping testkube-enterprise Helm-chart version"
+#          ./scripts/update.sh -c testkube-enterprise --strategy patch
+#
+#          enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version)
+#          echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV
+#
+#      - name: Lint Helm charts for safety
+#        run: |
+#          helm lint charts/testkube-cloud-ui
+#          helm lint charts/testkube-cloud-api
+#          helm lint charts/testkube-enterprise
+#
+#      - name: Install Helm Docs
+#        uses: envoy/install-helm-docs@v1.0.0
+#        with:
+#          version: 1.11.0
+#
+#      - name: Update Helm Docs
+#        run: |
+#          set -ex
+#          helm-docs
+#
+#      - name: Add a release asset
+#        run: |
+#          if [[ "${{ github.event.client_payload.app }}" == "testkube-cloud-api" ]]; then
+#            release_asset="testkube-cloud-api"
+#            asset_chart_version=$(./scripts/update.sh -c testkube-cloud-api --print-chart-version)
+#            echo "RELEASE_ASSET=$release_asset" >> $GITHUB_ENV
+#            echo "ASSET_CHART_VERSION=$asset_chart_version" >> $GITHUB_ENV
+#
+#            helm package charts/testkube-cloud-api --destination archives
+#
+#          elif [[ "${{ github.event.client_payload.app }}" == "testkube-cloud-ui" ]]; then
+#            release_asset="testkube-cloud-ui"
+#            asset_chart_version=$(./scripts/update.sh -c testkube-cloud-ui --print-chart-version)
+#            echo "RELEASE_ASSET=$release_asset" >> $GITHUB_ENV
+#            echo "ASSET_CHART_VERSION=$asset_chart_version" >> $GITHUB_ENV
+#
+#            helm package charts/testkube-cloud-ui --destination archives
+#
+#          else
+#            echo "Unknown app: ${{ github.event.client_payload.app }}"
+#            exit 1
+#          fi
+#
+#      - name: Package charts & update Helm repo index
+#        run: |
+#          echo "Packaging ${{ github.event.client_payload.app }} chart"
+#          helm package charts/testkube-cloud-api --destination archives
+#
+#          echo "Packaging testkube-enterprise chart"
+#          helm package charts/testkube-enterprise --destination archives
+#
+#          helm repo index .
+#
+#      - name: Commit & push changes
+#        run: |
+#          git add **/*Chart.yaml **/*README.md **/*values.yaml archives/*.tgz
+#          git commit -m "updating chart ${{ github.event.client_payload.app }} version to "${{ env.CHART_VERSION }}" and appVersion to ${{ github.event.client_payload.appVersion }}; Updating testkube-enterprise chart version to ${{ env.ENTERPRISE_CHART_VERSION }}."
+#          git push
+#
+#      - name: Bump version and push tag
+#        id: tag
+#        uses: anothrNick/github-tag-action@1.64.0
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          WITH_V: true
+#          DEFAULT_BUMP: patch
+#
+#      - name: Changelog
+#        uses: scottbrenner/generate-changelog-action@master
+#        id: changelog
+#
+#      - name: Create a GitHub release for the app
+#        uses: ncipollo/release-action@v1
+#        with:
+#          tag: ${{ steps.tag.outputs.new_tag }}
+#          name: ${{ steps.tag.outputs.new_tag }}
+#          body: ${{ steps.changelog.outputs.changelog }}
+#          artifacts: |
+#            archives/${{ github.event.client_payload.app }}-${{ env.CHART_VERSION }}.tgz
+#            archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz
+#            archives/${{ env.RELEASE_ASSET }}-${{ env.ASSET_CHART_VERSION }}.tgz
+#
+#      - name: Release to Keygen
+#        uses: getgrit/keygen-action@main
+#        with:
+#          # Required: Keygen Account ID or slug
+#          account-id: "${{ secrets.KEYGEN_ACCOUNT_ID }}"
+#          # Required: A Product or User Token (ref. https://keygen.sh/docs/api/authentication/#token-authentication)
+#          token: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_TOKEN }}"
+#          # Required: Product ID
+#          product-id: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_ID }}"
+#          # Required (boolean): true to publish the created release; false to keep it in the DRAFT state.
+#          release-publish: true
+#          # Optional
+#          release-name: 'Testkube Enterprise v${{ env.ENTERPRISE_CHART_VERSION }}'
+#          # Required: must be a valid semver value, without the `v` prefix
+#          release-version: '${{ env.ENTERPRISE_CHART_VERSION }}'
+#          # Required
+#          release-channel: 'stable'
+#          # Optional
+#          release-tag: 'latest'
+#          artifacts-json: |
+#            [
+#              {
+#                "filepath": "./archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz",
+#                "platform": "linux",
+#                "arch": "amd64"
+#              }
+#            ]
diff --git a/.github/workflows/release-main.yaml b/.github/workflows/release-main.yaml
index 61bded1d0..338b476fa 100644
--- a/.github/workflows/release-main.yaml
+++ b/.github/workflows/release-main.yaml
@@ -3,21 +3,21 @@ name: Release Helm charts - main
 on:
   push:
     branches:
-      - main
-    paths:
-      - 'charts/testkube-cloud-api/templates/**'
-      - 'charts/testkube-cloud-api/Chart.yaml'
-      - 'charts/testkube-cloud-api/values.yaml'
-      - 'charts/testkube-cloud-api/README.md'
-      - 'charts/testkube-cloud-ui/templates/**'
-      - 'charts/testkube-cloud-ui/Chart.yaml'
-      - 'charts/testkube-cloud-ui/values.yaml'
-      - 'charts/testkube-cloud-ui/README.md'
-      - 'charts/testkube-enterprise/templates/**'
-      - 'charts/testkube-enterprise/Chart.yaml'
-      - 'charts/testkube-enterprise/values.yaml'
-      - 'charts/testkube-enterprise/README.md'
-
+     - main
+#    paths:
+#      - 'charts/testkube-cloud-api/templates/**'
+#      - 'charts/testkube-cloud-api/Chart.yaml'
+#      - 'charts/testkube-cloud-api/values.yaml'
+#      - 'charts/testkube-cloud-api/README.md'
+#      - 'charts/testkube-cloud-ui/templates/**'
+#      - 'charts/testkube-cloud-ui/Chart.yaml'
+#      - 'charts/testkube-cloud-ui/values.yaml'
+#      - 'charts/testkube-cloud-ui/README.md'
+#      - 'charts/testkube-enterprise/templates/**'
+#      - 'charts/testkube-enterprise/Chart.yaml'
+#      - 'charts/testkube-enterprise/values.yaml'
+#      - 'charts/testkube-enterprise/README.md'
+#
 jobs:
   release-helm-charts:
     name: Release Helm charts
@@ -27,142 +27,142 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Update Helm chart with changes files
-        run: |
-          echo "Testkube Helm charts diff"
-          changed_files=$(git --no-pager diff HEAD~1 charts)
-
-          if [[ "$changed_files" == *"testkube-cloud-api/"* ]]; then
-            echo "Changes detected in files within the 'testkube-cloud-api' directory. Updating the chart minor version."
-            ./scripts/update.sh -c testkube-cloud-api --strategy minor
-          else
-            echo "No changes detected in the specified directories."
-          fi
-
-          if [[ "$changed_files" == *"testkube-cloud-ui/"* ]]; then
-            echo "Changes detected in files within the 'testkube-cloud-ui' directory. Updating the chart minor version."
-            ./scripts/update.sh -c testkube-cloud-ui --strategy minor
-          else
-            echo "No changes detected in the specified directories."
-          fi
-
-          tk_api_chart_version=$(./scripts/update.sh -c testkube-cloud-api --print-chart-version)
-          echo "New testkube-cloud-api chart version is $tk_api_chart_version" >> $GITHUB_STEP_SUMMARY
-          echo "API_CHART_VERSION=$tk_api_chart_version" >> $GITHUB_ENV
-
-          tk_ui_chart_version=$(./scripts/update.sh -c testkube-cloud-ui --print-chart-version)
-          echo "New testkube-cloud-ui chart version is $tk_ui_chart_version" >> $GITHUB_STEP_SUMMARY
-          echo "UI_CHART_VERSION=$tk_ui_chart_version" >> $GITHUB_ENV
-
-      - name: Sync & Update Testkube Enterprise Helm chart
-        run: |
-          bump_strategy="minor"
-          changed=$(git status --porcelain charts/testkube-enterprise | wc -l)
-          if [ $changed -gt 0 ]; then
-            bump_strategy="none"
-          fi
-          
-          echo "Syncing subchart versions in testkube-enterprise Helm chart"
-          ./scripts/sync.sh
-          
-          echo "Updating testkube-enterprise Helm chart version with bump strategy: $bump_strategy"
-          ./scripts/update.sh -c testkube-enterprise -s $bump_strategy --verbose
-          
-          enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version)
-          echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV
-          
-          echo -e "### Testkube Enterprise Helm chart diff" >> $GITHUB_STEP_SUMMARY
-          echo -e '```' >> $GITHUB_STEP_SUMMARY
-          git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY
-          echo -e '```' >> $GITHUB_STEP_SUMMARY
-
-      - name: Lint Helm charts for safety
-        run: |
-          helm lint charts/testkube-cloud-ui
-          helm lint charts/testkube-cloud-api
-          helm lint charts/testkube-enterprise
-
-      - name: Install Helm Docs
-        uses: envoy/install-helm-docs@v1.0.0
-        with:
-          version: 1.11.0
-
-      - name: Update Helm Docs
-        run: |
-          set -ex
-          helm-docs
-
-      - name: Package Helm charts
-        run: |
-          helm package charts/testkube-cloud-api --destination archives
-          helm package charts/testkube-cloud-ui --destination archives
-          helm dependency update charts/testkube-enterprise
-          helm package charts/testkube-enterprise --destination archives
-          echo "Updating Helm repository index"
-          helm repo index .  
-
-      - name: Commit & push changes
-        run: |
-          git config --global user.name "testkube-cloud-ci-bot"
-          git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
-          git status
-          git add **/*Chart.yaml **/*README.md archives/*.tgz
-          git commit -m "updating testkube-enterprise chart version to ${{ env.ENTERPRISE_CHART_VERSION }}"
-          git push
-
-      - name: Bump version and push tag
-        id: tag
-        uses: anothrNick/github-tag-action@1.64.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: true
-          DEFAULT_BUMP: minor
-
-      - name: Changelog
-        uses: scottbrenner/generate-changelog-action@master
-        id: changelog
-
-      - name: Create a GitHub release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.tag.outputs.new_tag }}
-          name: ${{ steps.tag.outputs.new_tag }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          artifacts: |
-            archives/testkube-cloud-ui-${{ env.UI_CHART_VERSION }}.tgz
-            archives/testkube-cloud-api-${{ env.API_CHART_VERSION }}.tgz
-            archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz
-
-      - name: Release to Keygen
-        uses: getgrit/keygen-action@main
-        with:
-          # Required: Keygen Account ID or slug
-          account-id: "${{ secrets.KEYGEN_ACCOUNT_ID }}"
-          # Required: A Product or User Token (ref. https://keygen.sh/docs/api/authentication/#token-authentication)
-          token: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_TOKEN }}"
-          # Required: Product ID
-          product-id: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_ID }}"
-          # Required (boolean): true to publish the created release; false to keep it in the DRAFT state.
-          release-publish: true
-          # Optional
-          release-name: 'Testkube Enterprise v${{ env.ENTERPRISE_CHART_VERSION }}'
-          # Required: must be a valid semver value, without the `v` prefix
-          release-version: '${{ env.ENTERPRISE_CHART_VERSION }}'
-          # Required
-          release-channel: 'stable'
-          # Optional
-          release-tag: 'latest'
-          artifacts-json: |
-            [
-              {
-                "filepath": "./archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz",
-                "platform": "linux",
-                "arch": "amd64"
-              }
-            ]
+#
+#      - name: Install Helm
+#        uses: azure/setup-helm@v3
+#        with:
+#          token: ${{ secrets.GITHUB_TOKEN }}
+#
+#      - name: Update Helm chart with changes files
+#        run: |
+#          echo "Testkube Helm charts diff"
+#          changed_files=$(git --no-pager diff HEAD~1 charts)
+#
+#          if [[ "$changed_files" == *"testkube-cloud-api/"* ]]; then
+#            echo "Changes detected in files within the 'testkube-cloud-api' directory. Updating the chart minor version."
+#            ./scripts/update.sh -c testkube-cloud-api --strategy minor
+#          else
+#            echo "No changes detected in the specified directories."
+#          fi
+#
+#          if [[ "$changed_files" == *"testkube-cloud-ui/"* ]]; then
+#            echo "Changes detected in files within the 'testkube-cloud-ui' directory. Updating the chart minor version."
+#            ./scripts/update.sh -c testkube-cloud-ui --strategy minor
+#          else
+#            echo "No changes detected in the specified directories."
+#          fi
+#
+#          tk_api_chart_version=$(./scripts/update.sh -c testkube-cloud-api --print-chart-version)
+#          echo "New testkube-cloud-api chart version is $tk_api_chart_version" >> $GITHUB_STEP_SUMMARY
+#          echo "API_CHART_VERSION=$tk_api_chart_version" >> $GITHUB_ENV
+#
+#          tk_ui_chart_version=$(./scripts/update.sh -c testkube-cloud-ui --print-chart-version)
+#          echo "New testkube-cloud-ui chart version is $tk_ui_chart_version" >> $GITHUB_STEP_SUMMARY
+#          echo "UI_CHART_VERSION=$tk_ui_chart_version" >> $GITHUB_ENV
+#
+#      - name: Sync & Update Testkube Enterprise Helm chart
+#        run: |
+#          bump_strategy="minor"
+#          changed=$(git status --porcelain charts/testkube-enterprise | wc -l)
+#          if [ $changed -gt 0 ]; then
+#            bump_strategy="none"
+#          fi
+#
+#          echo "Syncing subchart versions in testkube-enterprise Helm chart"
+#          ./scripts/sync.sh
+#
+#          echo "Updating testkube-enterprise Helm chart version with bump strategy: $bump_strategy"
+#          ./scripts/update.sh -c testkube-enterprise -s $bump_strategy --verbose
+#
+#          enterprise_chart_version=$(./scripts/update.sh -c testkube-enterprise --print-chart-version)
+#          echo "ENTERPRISE_CHART_VERSION=$enterprise_chart_version" >> $GITHUB_ENV
+#
+#          echo -e "### Testkube Enterprise Helm chart diff" >> $GITHUB_STEP_SUMMARY
+#          echo -e '```' >> $GITHUB_STEP_SUMMARY
+#          git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY
+#          echo -e '```' >> $GITHUB_STEP_SUMMARY
+#
+#      - name: Lint Helm charts for safety
+#        run: |
+#          helm lint charts/testkube-cloud-ui
+#          helm lint charts/testkube-cloud-api
+#          helm lint charts/testkube-enterprise
+#
+#      - name: Install Helm Docs
+#        uses: envoy/install-helm-docs@v1.0.0
+#        with:
+#          version: 1.11.0
+#
+#      - name: Update Helm Docs
+#        run: |
+#          set -ex
+#          helm-docs
+#
+#      - name: Package Helm charts
+#        run: |
+#          helm package charts/testkube-cloud-api --destination archives
+#          helm package charts/testkube-cloud-ui --destination archives
+#          helm dependency update charts/testkube-enterprise
+#          helm package charts/testkube-enterprise --destination archives
+#          echo "Updating Helm repository index"
+#          helm repo index .
+#
+#      - name: Commit & push changes
+#        run: |
+#          git config --global user.name "testkube-cloud-ci-bot"
+#          git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
+#          git status
+#          git add **/*Chart.yaml **/*README.md archives/*.tgz
+#          git commit -m "updating testkube-enterprise chart version to ${{ env.ENTERPRISE_CHART_VERSION }}"
+#          git push
+#
+#      - name: Bump version and push tag
+#        id: tag
+#        uses: anothrNick/github-tag-action@1.64.0
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          WITH_V: true
+#          DEFAULT_BUMP: minor
+#
+#      - name: Changelog
+#        uses: scottbrenner/generate-changelog-action@master
+#        id: changelog
+#
+#      - name: Create a GitHub release
+#        uses: ncipollo/release-action@v1
+#        with:
+#          tag: ${{ steps.tag.outputs.new_tag }}
+#          name: ${{ steps.tag.outputs.new_tag }}
+#          body: ${{ steps.changelog.outputs.changelog }}
+#          artifacts: |
+#            archives/testkube-cloud-ui-${{ env.UI_CHART_VERSION }}.tgz
+#            archives/testkube-cloud-api-${{ env.API_CHART_VERSION }}.tgz
+#            archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz
+#
+#      - name: Release to Keygen
+#        uses: getgrit/keygen-action@main
+#        with:
+#          # Required: Keygen Account ID or slug
+#          account-id: "${{ secrets.KEYGEN_ACCOUNT_ID }}"
+#          # Required: A Product or User Token (ref. https://keygen.sh/docs/api/authentication/#token-authentication)
+#          token: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_TOKEN }}"
+#          # Required: Product ID
+#          product-id: "${{ secrets.KEYGEN_TESTKUBE_ENTERPRISE_PRODUCT_ID }}"
+#          # Required (boolean): true to publish the created release; false to keep it in the DRAFT state.
+#          release-publish: true
+#          # Optional
+#          release-name: 'Testkube Enterprise v${{ env.ENTERPRISE_CHART_VERSION }}'
+#          # Required: must be a valid semver value, without the `v` prefix
+#          release-version: '${{ env.ENTERPRISE_CHART_VERSION }}'
+#          # Required
+#          release-channel: 'stable'
+#          # Optional
+#          release-tag: 'latest'
+#          artifacts-json: |
+#            [
+#              {
+#                "filepath": "./archives/testkube-enterprise-${{ env.ENTERPRISE_CHART_VERSION }}.tgz",
+#                "platform": "linux",
+#                "arch": "amd64"
+#              }
+#            ]
diff --git a/charts/testkube-cloud-api-1.13.88.tgz b/charts/testkube-cloud-api-1.13.88.tgz
new file mode 100644
index 000000000..8bcbf3820
Binary files /dev/null and b/charts/testkube-cloud-api-1.13.88.tgz differ
diff --git a/charts/testkube-cloud-ui/Chart.yaml b/charts/testkube-cloud-ui/Chart.yaml
index 26e42b02b..5278968bc 100644
--- a/charts/testkube-cloud-ui/Chart.yaml
+++ b/charts/testkube-cloud-ui/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: testkube-cloud-ui
 description: A Helm chart for Testkube Cloud UI
 type: application
-version: 1.13.79
-appVersion: 1.3.1
+version: 1.16.0
+appVersion: 1.6.0
 maintainers:
   - name: testkube
     url: https://testkube.io
diff --git a/charts/testkube-cloud-ui/README.md b/charts/testkube-cloud-ui/README.md
index eaefa77f2..5be1cfaa8 100644
--- a/charts/testkube-cloud-ui/README.md
+++ b/charts/testkube-cloud-ui/README.md
@@ -53,7 +53,7 @@ A Helm chart for Testkube Cloud UI
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` | Pod Security Context |
-| replicaCount | int | `1` |  |
+| replicaCount | int | `2` |  |
 | resources.limits.cpu | string | `"150m"` |  |
 | resources.limits.memory | string | `"128Mi"` |  |
 | resources.requests.cpu | string | `"50m"` |  |
diff --git a/charts/testkube-enterprise-1.12.33.tgz b/charts/testkube-enterprise-1.12.33.tgz
new file mode 100644
index 000000000..3627f4202
Binary files /dev/null and b/charts/testkube-enterprise-1.12.33.tgz differ
diff --git a/charts/testkube-enterprise/Chart.lock b/charts/testkube-enterprise/Chart.lock
index bf6dcd4d9..28a0e930d 100644
--- a/charts/testkube-enterprise/Chart.lock
+++ b/charts/testkube-enterprise/Chart.lock
@@ -4,10 +4,10 @@ dependencies:
   version: 2.2.5
 - name: testkube-cloud-api
   repository: file://../testkube-cloud-api
-  version: 1.13.88
+  version: 1.13.89
 - name: testkube-cloud-ui
   repository: file://../testkube-cloud-ui
-  version: 1.13.79
+  version: 1.16.0
 - name: dex
   repository: https://charts.dexidp.io
   version: 0.14.1
@@ -17,5 +17,10 @@ dependencies:
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
   version: 0.14.2
-digest: sha256:f593de27319e75d65449cbff2ffec9ed0650d39c416f5eb876282201891063ee
-generated: "2023-09-04T12:51:15.266745868+03:00"
+<<<<<<< HEAD
+digest: sha256:ea08a063d4140638d7436ca69d0fed79e5c5802888799794fbeee5166e40fbef
+generated: "2023-11-07T12:40:17.338030041Z"
+=======
+digest: sha256:439d4e3107c05334dff0684d55007fd23feb33d9e3a4c459eae2828d0f850828
+generated: "2023-08-29T08:16:34.376278456Z"
+>>>>>>> 986e233 (updating chart testkube-cloud-api version to 1.13.88 and appVersion to v1.4.0-dev-077e04c; Updating testkube-enterprise chart version to 1.12.33.)
diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml
index 7a6e22514..254702e58 100644
--- a/charts/testkube-enterprise/Chart.yaml
+++ b/charts/testkube-enterprise/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: testkube-enterprise
 description: A Helm chart for Testkube Enterprise
 type: application
-version: 1.14.2
+version: 1.17.0
 dependencies:
   - name: common
     version: 2.2.5
@@ -11,7 +11,7 @@ dependencies:
     version: 1.13.89
     repository: file://../testkube-cloud-api
   - name: testkube-cloud-ui
-    version: 1.13.79
+    version: 1.16.0
     repository: file://../testkube-cloud-ui
   - name: dex
     version: 0.14.1
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-api-1.13.88.tgz b/charts/testkube-enterprise/charts/testkube-cloud-api-1.13.88.tgz
new file mode 100644
index 000000000..79736d790
Binary files /dev/null and b/charts/testkube-enterprise/charts/testkube-cloud-api-1.13.88.tgz differ
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-ui-1.13.78.tgz b/charts/testkube-enterprise/charts/testkube-cloud-ui-1.13.78.tgz
new file mode 100644
index 000000000..653e3a16c
Binary files /dev/null and b/charts/testkube-enterprise/charts/testkube-cloud-ui-1.13.78.tgz differ