From 634245841959d56b540876dfd30ca45dd6afdcaa Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Tue, 7 Jun 2022 08:43:46 +0300
Subject: [PATCH] Remove old implementation made redundant with competition for
 preferences of helm repositories

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 ...m-helm-repository-preferences.test.ts.snap | 1406 +----------------
 ...tory-from-list-in-preferences.test.ts.snap | 1168 +-------------
 ...ive-repository-in-preferences.test.ts.snap |  504 +-----
 ...m-repositories-in-preferences.test.ts.snap |  878 +---------
 src/renderer/bootstrap.tsx                    |    3 -
 .../+preferences/add-helm-repo-dialog.tsx     |  220 ---
 .../components/+preferences/helm-charts.tsx   |  202 ---
 .../components/+preferences/kubernetes.tsx    |    5 +-
 ...-custom-helm-repository-dialog-content.tsx |    2 +-
 ...ation-of-custom-helm-repository-dialog.tsx |    2 +-
 .../add-helm-repo-dialog.scss                 |    0
 .../activation-of-public-helm-repository.tsx  |   28 +-
 .../helm-charts}/helm-charts.module.scss      |    0
 .../{helm-charts-2.tsx => helm-charts.tsx}    |    0
 .../helm-charts/helm-repositories.tsx         |    2 +-
 15 files changed, 228 insertions(+), 4192 deletions(-)
 delete mode 100644 src/renderer/components/+preferences/add-helm-repo-dialog.tsx
 delete mode 100644 src/renderer/components/+preferences/helm-charts.tsx
 rename src/renderer/components/+preferences/{ => kubernetes/helm-charts/activation-of-custom-helm-repository}/add-helm-repo-dialog.scss (100%)
 rename src/renderer/components/+preferences/{ => kubernetes/helm-charts}/helm-charts.module.scss (100%)
 rename src/renderer/components/+preferences/kubernetes/helm-charts/{helm-charts-2.tsx => helm-charts.tsx} (100%)

diff --git a/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap
index 402371797a..8f7aea7437 100644
--- a/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap
@@ -313,7 +313,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -329,7 +329,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -339,7 +339,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -347,7 +347,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -397,120 +397,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -880,11 +766,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -893,32 +779,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -931,22 +816,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -968,105 +839,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -1464,11 +1236,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -1477,32 +1249,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1515,22 +1286,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -1552,105 +1309,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2157,11 +1815,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2170,32 +1828,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2208,22 +1865,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -2245,105 +1888,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2749,11 +2293,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2762,32 +2306,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2800,22 +2343,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -2837,105 +2366,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -3442,11 +2872,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -3455,32 +2885,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3493,22 +2922,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -3530,105 +2945,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -4311,11 +3627,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -4324,32 +3640,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4362,22 +3677,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -4399,105 +3700,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -5004,11 +4206,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -5017,32 +4219,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -5055,22 +4256,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -5092,105 +4279,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -5873,11 +4961,11 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -5886,32 +4974,31 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -5924,22 +5011,8 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -5961,105 +5034,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -6570,7 +5544,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -6586,7 +5560,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -6596,7 +5570,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -6604,7 +5578,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6654,120 +5628,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -7149,7 +6009,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -7165,7 +6025,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -7175,7 +6035,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -7183,7 +6043,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -7233,120 +6093,6 @@ exports[`activate custom helm repository in preferences when navigating to prefe
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
diff --git a/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap
index 4ed1a6d5ad..99f69ad220 100644
--- a/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap
@@ -313,7 +313,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -329,7 +329,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -339,7 +339,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -347,7 +347,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -397,120 +397,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -880,11 +766,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -893,32 +779,31 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -931,22 +816,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -968,105 +839,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -1464,11 +1236,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -1477,32 +1249,33 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
-                            aria-expanded="false"
+                            aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                            aria-expanded="true"
                             aria-haspopup="true"
+                            aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1515,22 +1288,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -1552,107 +1311,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--menu-is-open css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="true"
-                              aria-haspopup="true"
-                              aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2101,11 +1759,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2114,35 +1772,34 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                             tabindex="0"
                             type="text"
                             value=""
@@ -2152,22 +1809,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -2189,105 +1832,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2689,7 +2233,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2705,7 +2249,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -2715,7 +2259,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -2723,10 +2267,10 @@ exports[`activate helm repository from list in preferences when navigating to pr
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                             tabindex="0"
                             type="text"
                             value=""
@@ -2773,120 +2317,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -3256,11 +2686,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -3269,35 +2699,34 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                             tabindex="0"
                             type="text"
                             value=""
@@ -3307,22 +2736,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -3344,105 +2759,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -3868,11 +3184,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -3881,32 +3197,33 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control Select__control--menu-is-open css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
-                            aria-expanded="false"
+                            aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                            aria-expanded="true"
                             aria-haspopup="true"
+                            aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3919,22 +3236,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -3956,107 +3259,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--menu-is-open css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="true"
-                              aria-haspopup="true"
-                              aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -4543,11 +3745,11 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -4556,35 +3758,34 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                             tabindex="0"
                             type="text"
                             value=""
@@ -4594,22 +3795,8 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -4631,105 +3818,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -5159,7 +4247,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -5175,7 +4263,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -5185,7 +4273,7 @@ exports[`activate helm repository from list in preferences when navigating to pr
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -5193,10 +4281,10 @@ exports[`activate helm repository from list in preferences when navigating to pr
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
-                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                             tabindex="0"
                             type="text"
                             value=""
@@ -5243,120 +4331,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
diff --git a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 3a1d8f717c..99a3286f37 100644
--- a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -313,7 +313,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -329,7 +329,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -339,7 +339,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -347,7 +347,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -397,120 +397,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -880,11 +766,11 @@ exports[`deactivate helm repository from list of active repositories in preferen
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -893,32 +779,31 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -931,22 +816,8 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -968,105 +839,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -1464,11 +1236,11 @@ exports[`deactivate helm repository from list of active repositories in preferen
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -1477,32 +1249,31 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1515,22 +1286,8 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -1552,105 +1309,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2052,7 +1710,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2068,7 +1726,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -2078,7 +1736,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -2086,7 +1744,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2136,120 +1794,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index ff709a9d6c..c8429391f6 100644
--- a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -313,7 +313,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -329,7 +329,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -339,7 +339,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -347,7 +347,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -397,120 +397,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -884,7 +770,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -900,7 +786,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -910,7 +796,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -918,7 +804,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -968,120 +854,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -1451,11 +1223,11 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -1464,32 +1236,31 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1502,22 +1273,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -1539,105 +1296,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2067,7 +1725,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2083,7 +1741,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -2093,7 +1751,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -2101,7 +1759,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2151,120 +1809,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -2638,7 +2182,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -2654,7 +2198,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
@@ -2664,7 +2208,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
@@ -2672,7 +2216,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                             autocorrect="off"
                             class="Select__input"
                             disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2722,120 +2266,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--is-disabled css-1insrsq-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-jzldcf-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              disabled=""
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
-                          <span
-                            class="Select__indicator-separator css-109onse-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -3205,11 +2635,11 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -3218,32 +2648,31 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3256,22 +2685,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -3293,105 +2708,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
@@ -3767,11 +3083,11 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   class="flex gaps"
                 >
                   <div
-                    class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                    class="Select theme-lens box grow css-b62m3t-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-HelmRepoSelect-live-region"
+                      id="react-select-selection-of-active-public-helm-repository-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -3780,32 +3096,31 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      class="Select__control css-1s2u09g-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-HelmRepoSelect-placeholder"
+                          id="react-select-selection-of-active-public-helm-repository-placeholder"
                         >
                           Repositories
                         </div>
                         <div
-                          class="Select__input-container css-jzldcf-Input"
+                          class="Select__input-container css-6j8wv5-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-HelmRepoSelect-placeholder"
+                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            disabled=""
-                            id="HelmRepoSelect"
+                            id="selection-of-active-public-helm-repository"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3818,22 +3133,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       <div
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
-                        <div
-                          aria-hidden="true"
-                          class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                        >
-                          <span
-                            class="css-1xtdfmb-LoadingDot"
-                          />
-                          <span
-                            class="css-zoievk-LoadingDot"
-                          />
-                          <span
-                            class="css-x748d8-LoadingDot"
-                          />
-                        </div>
                         <span
-                          class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -3855,105 +3156,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                       </div>
                     </div>
                   </div>
-                  <button
-                    class="Button primary"
-                    type="button"
-                  >
-                    Add Custom Helm Repo
-                  </button>
-                </div>
-                <div
-                  class="repos"
-                >
-                  <div
-                    class="pt-5 relative"
-                  >
-                    <div
-                      class="Spinner singleColor center"
-                    />
-                  </div>
-                </div>
-              </div>
-              <div>
-                <div
-                  class="flex gaps"
-                >
-                  <div>
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
                   <button
                     class="Button primary"
                     data-testid="add-custom-helm-repo-button"
diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index fabb17cb5a..d0f671d20a 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -15,7 +15,6 @@ import * as LensExtensionsCommonApi from "../extensions/common-api";
 import * as LensExtensionsRendererApi from "../extensions/renderer-api";
 import { delay } from "../common/utils";
 import { isMac, isDevelopment } from "../common/vars";
-import { HelmRepoManager } from "../main/helm/helm-repo-manager";
 import { DefaultProps } from "./mui-base-theme";
 import configurePackages from "../common/configure-packages";
 import * as initializers from "./initializers";
@@ -151,8 +150,6 @@ export async function bootstrap(di: DiContainer) {
 
   extensionInstallationStateStore.bindIpcListeners();
 
-  HelmRepoManager.createInstance(); // initialize the manager
-
   // Register additional store listeners
   clusterStore.registerIpcListener();
 
diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
deleted file mode 100644
index 60b7ba1d44..0000000000
--- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import "./add-helm-repo-dialog.scss";
-
-import React from "react";
-import type { FileFilter } from "electron";
-import { observable, makeObservable, action } from "mobx";
-import { observer } from "mobx-react";
-import type { DialogProps } from "../dialog";
-import { Dialog } from "../dialog";
-import { Wizard, WizardStep } from "../wizard";
-import { Input } from "../input";
-import { Checkbox } from "../checkbox";
-import { Button } from "../button";
-import { systemName, isUrl, isPath } from "../input/input_validators";
-import { SubTitle } from "../layout/sub-title";
-import { Icon } from "../icon";
-import { Notifications } from "../notifications";
-import { type HelmRepo, HelmRepoManager } from "../../../main/helm/helm-repo-manager";
-import { requestOpenFilePickingDialog } from "../../ipc";
-
-export interface AddHelmRepoDialogProps extends Partial<DialogProps> {
-  onAddRepo: () => void;
-}
-
-enum FileType {
-  CaFile = "caFile",
-  KeyFile = "keyFile",
-  CertFile = "certFile",
-}
-
-const dialogState = observable.object({
-  isOpen: false,
-});
-
-function getEmptyRepo(): HelmRepo {
-  return { name: "", url: "", username: "", password: "", insecureSkipTlsVerify: false, caFile: "", keyFile: "", certFile: "" };
-}
-@observer
-export class AddHelmRepoDialog extends React.Component<AddHelmRepoDialogProps> {
-  private static keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"];
-  private static certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"];
-
-  constructor(props: AddHelmRepoDialogProps) {
-    super(props);
-    makeObservable(this);
-  }
-
-  static open() {
-    dialogState.isOpen = true;
-  }
-
-  static close() {
-    dialogState.isOpen = false;
-  }
-
-  @observable helmRepo = getEmptyRepo();
-  @observable showOptions = false;
-
-  @action
-    close = () => {
-      AddHelmRepoDialog.close();
-      this.helmRepo = getEmptyRepo();
-      this.showOptions = false;
-    };
-
-  setFilepath(type: FileType, value: string) {
-    this.helmRepo[type] = value;
-  }
-
-  getFilePath(type: FileType) {
-    return this.helmRepo[type];
-  }
-
-  async selectFileDialog(type: FileType, fileFilter: FileFilter) {
-    const { canceled, filePaths } = await requestOpenFilePickingDialog({
-      defaultPath: this.getFilePath(type),
-      properties: ["openFile", "showHiddenFiles"],
-      message: `Select file`,
-      buttonLabel: `Use file`,
-      filters: [
-        fileFilter,
-        { name: "Any", extensions: ["*"] },
-      ],
-    });
-
-    if (!canceled && filePaths.length) {
-      this.setFilepath(type, filePaths[0]);
-    }
-  }
-
-  async addCustomRepo() {
-    try {
-      await HelmRepoManager.getInstance().addRepo(this.helmRepo);
-      Notifications.ok((
-        <>
-          {"Helm repository "}
-          <b>{this.helmRepo.name}</b>
-          {" has been added."}
-        </>
-      ));
-      this.props.onAddRepo();
-      this.close();
-    } catch (err) {
-      Notifications.error((
-        <>
-          {"Adding helm branch "}
-          <b>{this.helmRepo.name}</b>
-          {" has failed: "}
-          {String(err)}
-        </>
-      ));
-    }
-  }
-
-  renderFileInput(placeholder:string, fileType:FileType, fileExtensions:string[]){
-    return (
-      <div className="flex gaps align-center">
-        <Input
-          placeholder={placeholder}
-          validators={isPath}
-          className="box grow"
-          value={this.getFilePath(fileType)}
-          onChange={v => this.setFilepath(fileType, v)}
-        />
-        <Icon
-          material="folder"
-          onClick={() => this.selectFileDialog(fileType, { name: placeholder, extensions: fileExtensions })}
-          tooltip="Browse"
-        />
-      </div>
-    );
-  }
-
-  renderOptions() {
-    return (
-      <>
-        <SubTitle title="Security settings" />
-        <Checkbox
-          label="Skip TLS certificate checks for the repository"
-          value={this.helmRepo.insecureSkipTlsVerify}
-          onChange={v => this.helmRepo.insecureSkipTlsVerify = v}
-        />
-        {this.renderFileInput("Key file", FileType.KeyFile, AddHelmRepoDialog.keyExtensions)}
-        {this.renderFileInput("Ca file", FileType.CaFile, AddHelmRepoDialog.certExtensions)}
-        {this.renderFileInput("Certificate file", FileType.CertFile, AddHelmRepoDialog.certExtensions)}
-        <SubTitle title="Chart Repository Credentials" />
-        <Input
-          placeholder="Username"
-          value={this.helmRepo.username}
-          onChange= {v => this.helmRepo.username = v}
-        />
-        <Input
-          type="password"
-          placeholder="Password"
-          value={this.helmRepo.password}
-          onChange={v => this.helmRepo.password = v}
-        />
-      </>
-    );
-  }
-
-  render() {
-    const { ...dialogProps } = this.props;
-
-    const header = <h5>Add custom Helm Repo</h5>;
-
-    return (
-      <Dialog
-        {...dialogProps}
-        className="AddHelmRepoDialog"
-        isOpen={dialogState.isOpen}
-        close={this.close}
-      >
-        <Wizard header={header} done={this.close}>
-          <WizardStep
-            contentClass="flow column"
-            nextLabel="Add"
-            next={() => this.addCustomRepo()}
-          >
-            <div className="flex column gaps">
-              <Input
-                autoFocus
-                required
-                placeholder="Helm repo name"
-                trim
-                validators={systemName}
-                value={this.helmRepo.name}
-                onChange={v => this.helmRepo.name = v}
-              />
-              <Input
-                required
-                placeholder="URL"
-                validators={isUrl}
-                value={this.helmRepo.url}
-                onChange={v => this.helmRepo.url = v}
-              />
-              <Button
-                plain
-                className="accordion"
-                onClick={() => this.showOptions = !this.showOptions}
-              >
-                More
-                <Icon
-                  small
-                  tooltip="More"
-                  material={this.showOptions ? "remove" : "add"}
-                />
-              </Button>
-              {this.showOptions && this.renderOptions()}
-            </div>
-          </WizardStep>
-        </Wizard>
-      </Dialog>
-    );
-  }
-}
diff --git a/src/renderer/components/+preferences/helm-charts.tsx b/src/renderer/components/+preferences/helm-charts.tsx
deleted file mode 100644
index d4f67902a6..0000000000
--- a/src/renderer/components/+preferences/helm-charts.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import styles from "./helm-charts.module.scss";
-
-import React from "react";
-import { observable, makeObservable, computed } from "mobx";
-
-import type { HelmRepo } from "../../../main/helm/helm-repo-manager";
-import { HelmRepoManager } from "../../../main/helm/helm-repo-manager";
-import { Button } from "../button";
-import { Icon } from "../icon";
-import { Notifications } from "../notifications";
-import type { SelectOption } from "../select";
-import { Select } from "../select";
-import { AddHelmRepoDialog } from "./add-helm-repo-dialog";
-import { observer } from "mobx-react";
-import { RemovableItem } from "./removable-item";
-import { Notice } from "../+extensions/notice";
-import { Spinner } from "../spinner";
-import { noop } from "../../utils";
-import type { SingleValue } from "react-select";
-
-@observer
-export class HelmCharts extends React.Component {
-  @observable loadingRepos = false;
-  @observable loadingAvailableRepos = false;
-  @observable repos: HelmRepo[] = [];
-  @observable addedRepos = observable.map<string, HelmRepo>();
-
-  constructor(props: {}) {
-    super(props);
-    makeObservable(this);
-  }
-
-  @computed get repoOptions() {
-    return this.repos.map(repo => ({
-      value: repo,
-      label: repo.name,
-      isSelected: this.addedRepos.has(repo.name),
-    }));
-  }
-
-  componentDidMount() {
-    this.loadAvailableRepos().catch(noop);
-    this.loadRepos().catch(noop);
-  }
-
-  async loadAvailableRepos() {
-    this.loadingAvailableRepos = true;
-
-    try {
-      if (!this.repos.length) {
-        this.repos = await HelmRepoManager.getInstance().loadAvailableRepos();
-      }
-    } catch (err) {
-      Notifications.error(String(err));
-    }
-
-    this.loadingAvailableRepos = false;
-  }
-
-  async loadRepos() {
-    this.loadingRepos = true;
-
-    try {
-      const repos = await HelmRepoManager.getInstance().repositories(); // via helm-cli
-
-      this.addedRepos.replace(repos.map(repo => [repo.name, repo]));
-    } catch (err) {
-      Notifications.error(String(err));
-    }
-
-    this.loadingRepos = false;
-  }
-
-  async addRepo(repo: HelmRepo) {
-    try {
-      await HelmRepoManager.getInstance().addRepo(repo);
-      this.addedRepos.set(repo.name, repo);
-    } catch (err) {
-      Notifications.error((
-        <>
-          {"Adding helm branch "}
-          <b>{repo.name}</b>
-          {" has failed: "}
-          {String(err)}
-        </>
-      ));
-    }
-  }
-
-  async removeRepo(repo: HelmRepo) {
-    try {
-      await HelmRepoManager.getInstance().removeRepo(repo);
-      this.addedRepos.delete(repo.name);
-    } catch (err) {
-      Notifications.error(
-        <>
-          {"Removing helm branch "}
-          <b>{repo.name}</b>
-          {" has failed: "}
-          {String(err)}
-        </>,
-      );
-    }
-  }
-
-  onRepoSelect = async (option: SingleValue<{ value: HelmRepo }>): Promise<void> => {
-    if (!option) {
-      return;
-    }
-
-    if (this.addedRepos.has(option.value.name)) {
-      return void Notifications.ok((
-        <>
-          {"Helm repo "}
-          <b>{option.value.name}</b>
-          {" already in use."}
-        </>
-      ));
-    }
-
-    await this.addRepo(option.value);
-  };
-
-  formatOptionLabel = ({ value, isSelected }: SelectOption<HelmRepo>) => (
-    <div className="flex gaps">
-      <span>{value.name}</span>
-      {isSelected && (
-        <Icon
-          small
-          material="check"
-          className="box right" />
-      )}
-    </div>
-  );
-
-  renderRepositories() {
-    const repos = Array.from(this.addedRepos);
-
-    if (this.loadingRepos) {
-      return <div className="pt-5 relative"><Spinner center/></div>;
-    }
-
-    if (!repos.length) {
-      return (
-        <Notice>
-          <div className="flex-grow text-center">The repositories have not been added yet</div>
-        </Notice>
-      );
-    }
-
-    return repos.map(([name, repo]) => {
-      return (
-        <RemovableItem
-          key={name}
-          onRemove={() => this.removeRepo(repo)}
-          className="mt-3"
-        >
-          <div>
-            <div data-testid="repository-name" className={styles.repoName}>{name}</div>
-            <div className={styles.repoUrl}>{repo.url}</div>
-          </div>
-        </RemovableItem>
-      );
-    });
-  }
-
-  render() {
-    return (
-      <div>
-        <div className="flex gaps">
-          <Select
-            id="HelmRepoSelect"
-            placeholder="Repositories"
-            isLoading={this.loadingAvailableRepos}
-            isDisabled={this.loadingAvailableRepos}
-            options={this.repoOptions}
-            onChange={this.onRepoSelect}
-            value={this.repos}
-            formatOptionLabel={this.formatOptionLabel}
-            controlShouldRenderValue={false}
-            className="box grow"
-            themeName="lens"
-          />
-          <Button
-            primary
-            label="Add Custom Helm Repo"
-            onClick={AddHelmRepoDialog.open}
-          />
-        </div>
-        <AddHelmRepoDialog onAddRepo={() => this.loadRepos()}/>
-        <div className={styles.repos}>
-          {this.renderRepositories()}
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/src/renderer/components/+preferences/kubernetes.tsx b/src/renderer/components/+preferences/kubernetes.tsx
index 51f013f406..5305743530 100644
--- a/src/renderer/components/+preferences/kubernetes.tsx
+++ b/src/renderer/components/+preferences/kubernetes.tsx
@@ -4,9 +4,7 @@
  */
 import { observer } from "mobx-react";
 import React from "react";
-
-import { HelmCharts } from "./helm-charts";
-import { HelmCharts as HelmCharts2 } from "./kubernetes/helm-charts/helm-charts-2";
+import { HelmCharts } from "./kubernetes/helm-charts/helm-charts";
 import { KubeconfigSyncs } from "./kubeconfig-syncs";
 import { KubectlBinaries } from "./kubectl-binaries";
 import { Preferences } from "./preferences";
@@ -27,7 +25,6 @@ export const Kubernetes = observer(() => (
       <section id="helm">
         <h2>Helm Charts</h2>
         <HelmCharts />
-        <HelmCharts2 />
       </section>
     </section>
   </Preferences>
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx
index 37309a7f80..0c254d91fb 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import "../../../add-helm-repo-dialog.scss";
+import "./add-helm-repo-dialog.scss";
 
 import React from "react";
 import { Wizard, WizardStep } from "../../../../wizard";
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx
index eec64cefb2..612ef7fdde 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import "../../../add-helm-repo-dialog.scss";
+import "./add-helm-repo-dialog.scss";
 
 import React from "react";
 import { Dialog } from "../../../../dialog";
diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.scss b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/add-helm-repo-dialog.scss
similarity index 100%
rename from src/renderer/components/+preferences/add-helm-repo-dialog.scss
rename to src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/add-helm-repo-dialog.scss
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx
index 05d513bcbd..57c449e55b 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx
@@ -39,21 +39,19 @@ const NonInjectedActivationOfPublicHelmRepository = observer(({
   }));
 
   return (
-    <div>
-      <Select
-        id="selection-of-active-public-helm-repository"
-        placeholder="Repositories"
-        isLoading={valuesAreLoading}
-        isDisabled={valuesAreLoading}
-        options={repositoryOptions}
-        onChange={selectRepository}
-        value={dereferencesPublicRepositories}
-        formatOptionLabel={formatOptionLabel}
-        controlShouldRenderValue={false}
-        className="box grow"
-        themeName="lens"
-      />
-    </div>
+    <Select
+      id="selection-of-active-public-helm-repository"
+      placeholder="Repositories"
+      isLoading={valuesAreLoading}
+      isDisabled={valuesAreLoading}
+      options={repositoryOptions}
+      onChange={selectRepository}
+      value={dereferencesPublicRepositories}
+      formatOptionLabel={formatOptionLabel}
+      controlShouldRenderValue={false}
+      className="box grow"
+      themeName="lens"
+    />
   );
 });
 
diff --git a/src/renderer/components/+preferences/helm-charts.module.scss b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.module.scss
similarity index 100%
rename from src/renderer/components/+preferences/helm-charts.module.scss
rename to src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.module.scss
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts-2.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx
similarity index 100%
rename from src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts-2.tsx
rename to src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
index aab7cb9152..64f2523261 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import styles from "../../helm-charts.module.scss";
+import styles from "./helm-charts.module.scss";
 
 import React from "react";