diff --git a/addons/api/package.json b/addons/api/package.json
index a38301dec..2dfeaf358 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -60,7 +60,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/addons/auth/package.json b/addons/auth/package.json
index 44405d65b..f656717be 100644
--- a/addons/auth/package.json
+++ b/addons/auth/package.json
@@ -54,7 +54,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/addons/core/package.json b/addons/core/package.json
index 3bdf0c75c..4ede3ce38 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -69,7 +69,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 551479737..385d96c7c 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -282,7 +282,10 @@ target:
 credential-store:
   title: Credential Store
   title_plural: Credential Stores
-  description: A credential stores is a collection of credentials and credential libraries.
+  description: A credential store is a collection of credentials and credential libraries.
+  messages:
+    welcome:
+      title: Welcome to Credential Stores
   actions:
     delete: Delete Credential Store
 credential-library:
diff --git a/addons/rose/package.json b/addons/rose/package.json
index 04110e79e..dde5784b5 100644
--- a/addons/rose/package.json
+++ b/addons/rose/package.json
@@ -74,7 +74,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-try": "^1.4.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
index c8ff3b098..7b6e88c9e 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -8,7 +8,9 @@
       {{t 'resources.credential-store.title_plural'}}
       <DocLink @doc='credential-stores' @iconSize='large' />
     </h2>
-    <p>{{t 'resources.credential-store.description'}}</p>
+    {{#if @model}}
+      <p>{{t 'resources.credential-store.description'}}</p>
+    {{/if}}
   </page.header>
 
   <page.actions>
@@ -61,6 +63,25 @@
           {{/each}}
         </table.body>
       </Rose::Table>
+
+    {{else}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.credential-store.messages.welcome.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.credential-store.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.credential-stores.new'>
+            <Rose::Icon @name='plus-circle-outline' />
+            {{t 'titles.new'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+
     {{/if}}
+
   </page.body>
+
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 2d1e8f9b0..666ddc101 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -78,7 +78,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-template-lint-plugin-prettier": "^2.0.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 046442e65..dd0279831 100755
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -93,7 +93,7 @@
     "ember-template-lint": "^2.15.0",
     "ember-template-lint-plugin-prettier": "^2.0.0",
     "eslint": "^7.31.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.1.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
diff --git a/yarn.lock b/yarn.lock
index 82666df63..15234911f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10004,10 +10004,10 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-prettier@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
-  integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
+eslint-config-prettier@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
 eslint-plugin-ember@^10.1.1:
   version "10.5.0"