diff --git a/ui/admin/app/components/targets/target/actions/index.hbs b/ui/admin/app/components/targets/target/actions/index.hbs
index 064bdff34..793b422d7 100644
--- a/ui/admin/app/components/targets/target/actions/index.hbs
+++ b/ui/admin/app/components/targets/target/actions/index.hbs
@@ -8,14 +8,10 @@
       {{t 'resources.target.actions.add-host-sources'}}
     </dropdown.link>
   {{/if}}
-  {{#if (feature-flag 'credential-store')}}
-    {{#if (can 'addCredentialSources target' @model)}}
-      <dropdown.link
-        @route='scopes.scope.targets.target.add-credential-sources'
-      >
-        {{t 'resources.target.actions.add-credential-sources'}}
-      </dropdown.link>
-    {{/if}}
+  {{#if (can 'addCredentialSources target' @model)}}
+    <dropdown.link @route='scopes.scope.targets.target.add-credential-sources'>
+      {{t 'resources.target.actions.add-credential-sources'}}
+    </dropdown.link>
   {{/if}}
   {{#if (can 'delete model' @model)}}
     <dropdown.separator />
diff --git a/ui/admin/app/components/targets/target/nav/index.hbs b/ui/admin/app/components/targets/target/nav/index.hbs
index 8d35a9f03..36f07e944 100644
--- a/ui/admin/app/components/targets/target/nav/index.hbs
+++ b/ui/admin/app/components/targets/target/nav/index.hbs
@@ -5,9 +5,7 @@
   <nav.link @route='scopes.scope.targets.target.host-sources'>
     {{t 'resources.target.host-source.title_plural'}}
   </nav.link>
-  {{#if (feature-flag 'credential-store')}}
-    <nav.link @route='scopes.scope.targets.target.credential-sources'>
-      {{t 'resources.target.credential-source.title_plural'}}
-    </nav.link>
-  {{/if}}
+  <nav.link @route='scopes.scope.targets.target.credential-sources'>
+    {{t 'resources.target.credential-source.title_plural'}}
+  </nav.link>
 </Rose::Nav::Tabs>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs
index 89dff80d2..20ad15e36 100644
--- a/ui/admin/app/templates/scopes/scope.hbs
+++ b/ui/admin/app/templates/scopes/scope.hbs
@@ -99,12 +99,10 @@
             </nav.link>
           {{/if}}
           {{#if (can 'navigate model' @model collection='credential-stores')}}
-            {{#if (feature-flag 'credential-store')}}
-              <nav.link @route='scopes.scope.credential-stores'>
-                <Rose::Icon @name='flight-icons/svg/key-16' @size='medium' />
-                {{t 'resources.credential-store.title_plural'}}
-              </nav.link>
-            {{/if}}
+            <nav.link @route='scopes.scope.credential-stores'>
+              <Rose::Icon @name='flight-icons/svg/key-16' @size='medium' />
+              {{t 'resources.credential-store.title_plural'}}
+            </nav.link>
           {{/if}}
         </Rose::Nav::Sidebar>
       {{/if}}
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index 8b479f0ba..f1a531361 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -13,7 +13,6 @@ const featureEditions = {
     'oidc-account-crud': true,
     search: false,
     filter: true,
-    'credential-store': true,
     'managed-groups': true,
     'static-credentials': false,
   },
diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js
index 75035ba92..cb2841660 100644
--- a/ui/desktop/config/environment.js
+++ b/ui/desktop/config/environment.js
@@ -58,7 +58,6 @@ module.exports = function (environment) {
       oidc: true,
       search: false,
       filter: true,
-      'credential-store': false,
       'ssh-target': false,
     },
   };