diff --git a/addons/api/mirage/generated/factories/host.js b/addons/api/mirage/generated/factories/host.js
index db9de3b56..08ac8a5f3 100644
--- a/addons/api/mirage/generated/factories/host.js
+++ b/addons/api/mirage/generated/factories/host.js
@@ -5,7 +5,7 @@ import { random, date, internet, datatype } from 'faker';
  * GeneratedHostModelFactory
  */
 export default Factory.extend({
-  type: 'static',
+  type: () => random.arrayElement(['static', 'plugin']),
   name: () => random.words(),
   description: () => random.words(),
   created_time: () => date.recent(),
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
index ccf7e1ec3..eb69b4d5d 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
@@ -11,38 +11,41 @@
     </table.header>
     <table.body as |body|>
       {{#each @model as |host|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{#if (can 'read model' host)}}
-              <LinkTo
-                @route='scopes.scope.host-catalogs.host-catalog.hosts.host'
-                @model={{host.id}}
-              >
+        {{#if host.isStatic}}
+          <body.row as |row|>
+            <row.headerCell>
+              {{#if (can 'read model' host)}}
+                <LinkTo
+                  @route='scopes.scope.host-catalogs.host-catalog.hosts.host'
+                  @model={{host.id}}
+                >
+
+                  {{host.displayName}}
+                </LinkTo>
+              {{else}}
                 {{host.displayName}}
-              </LinkTo>
-            {{else}}
-              {{host.displayName}}
-            {{/if}}
-            <p>{{host.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>
-              {{t (concat 'resources.host.types.' host.type)}}
-            </Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{host.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{host.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            <code>{{host.attributes.address}}</code>
-          </row.cell>
-        </body.row>
+              {{/if}}
+              <p>{{host.description}}</p>
+            </row.headerCell>
+            <row.cell>
+              <Rose::Badge>
+                {{t (concat 'resources.host.types.' host.type)}}
+              </Rose::Badge>
+            </row.cell>
+            <row.cell>
+              <Copyable
+                @text={{host.id}}
+                @buttonText={{t 'actions.copy-to-clipboard'}}
+                @acknowledgeText={{t 'states.copied'}}
+              >
+                <code>{{host.id}}</code>
+              </Copyable>
+            </row.cell>
+            <row.cell>
+              <code>{{host.attributes.address}}</code>
+            </row.cell>
+          </body.row>
+        {{/if}}
       {{/each}}
     </table.body>
   </Rose::Table>
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs
index f48b2a895..ae19cb440 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs
@@ -5,37 +5,35 @@
   <Rose::Table as |table|>
     <table.body as |body|>
       {{#each @model.hosts as |host|}}
-        {{#if host.isStatic}}
-          <body.row as |row|>
-            <row.cell>
-              {{host.displayName}}
-              <p>{{host.description}}</p>
-            </row.cell>
-            <row.cell>
-              <Copyable
-                @text={{host.id}}
-                @buttonText={{t 'actions.copy-to-clipboard'}}
-                @acknowledgeText={{t 'states.copied'}}
-              >
-                <code>{{host.id}}</code>
-              </Copyable>
-            </row.cell>
-            <row.cell>{{host.attributes.address}}</row.cell>
-            <row.cell>
-              <Rose::Badge>{{t
-                  (concat 'resources.host.types.' host.type)
-                }}</Rose::Badge>
-            </row.cell>
-            <row.cell>
-              <Rose::Button
-                @style='secondary'
-                {{on 'click' (route-action 'connect' @model.target host)}}
-              >
-                {{t 'resources.session.actions.connect'}}
-              </Rose::Button>
-            </row.cell>
-          </body.row>
-        {{/if}}
+        <body.row as |row|>
+          <row.cell>
+            {{host.displayName}}
+            <p>{{host.description}}</p>
+          </row.cell>
+          <row.cell>
+            <Copyable
+              @text={{host.id}}
+              @buttonText={{t 'actions.copy-to-clipboard'}}
+              @acknowledgeText={{t 'states.copied'}}
+            >
+              <code>{{host.id}}</code>
+            </Copyable>
+          </row.cell>
+          <row.cell>{{host.attributes.address}}</row.cell>
+          <row.cell>
+            <Rose::Badge>{{t
+                (concat 'resources.host.types.' host.type)
+              }}</Rose::Badge>
+          </row.cell>
+          <row.cell>
+            <Rose::Button
+              @style='secondary'
+              {{on 'click' (route-action 'connect' @model.target host)}}
+            >
+              {{t 'resources.session.actions.connect'}}
+            </Rose::Button>
+          </row.cell>
+        </body.row>
       {{/each}}
     </table.body>
   </Rose::Table>
@@ -53,4 +51,4 @@
     </Rose::Message>
   </Rose::Layout::Centered>
 
-{{/if}}
\ No newline at end of file
+{{/if}}