diff --git a/addons/api/mirage/factories/account.js b/addons/api/mirage/factories/account.js
index d2bd7c8f3..20aa0c793 100644
--- a/addons/api/mirage/factories/account.js
+++ b/addons/api/mirage/factories/account.js
@@ -50,7 +50,8 @@ export default factory.extend({
       }
       case TYPE_AUTH_METHOD_OIDC:
         return {
-          issuer: faker.internet.ip(),
+          issuer:
+            Math.random() > 0.5 ? faker.internet.ip() : faker.internet.ipv6(),
           subject: 'sub',
           email: faker.internet.email(),
           full_name: faker.person.fullName(),
diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js
index 74a9bdcae..8a2150bbf 100644
--- a/addons/api/mirage/factories/credential-store.js
+++ b/addons/api/mirage/factories/credential-store.js
@@ -39,7 +39,8 @@ export default factory.extend({
     switch (this.type) {
       case 'vault':
         return {
-          address: faker.internet.ip(),
+          address:
+            Math.random() > 0.5 ? faker.internet.ip() : faker.internet.ipv6(),
           namespace: faker.word.words(1),
           ca_cert: 'ca-cert-123',
           tls_server_name: faker.internet.domainName(),
diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js
index 8442d6dd5..5ffae4046 100644
--- a/addons/api/mirage/factories/host-set.js
+++ b/addons/api/mirage/factories/host-set.js
@@ -43,10 +43,12 @@ export default factory.extend({
   },
   preferred_endpoints() {
     if (this.type === 'plugin') {
-      const enpointsAmount = faker.number.int({ min: 1, max: 5 });
+      const endpointsAmount = faker.number.int({ min: 1, max: 5 });
       let result = [];
-      for (let i = 0; i < enpointsAmount; ++i) {
-        result.push(faker.internet.ip());
+      for (let i = 0; i < endpointsAmount; ++i) {
+        result.push(
+          Math.random() > 0.5 ? faker.internet.ip() : faker.internet.ipv6(),
+        );
       }
       return result;
     }
diff --git a/addons/api/mirage/factories/host.js b/addons/api/mirage/factories/host.js
index 64d86ac60..4e6932f2d 100644
--- a/addons/api/mirage/factories/host.js
+++ b/addons/api/mirage/factories/host.js
@@ -36,7 +36,9 @@ export default factory.extend({
     const addressesAmount = Math.floor(Math.random() * 6) + 1;
     let result = [];
     for (let i = 0; i < addressesAmount; ++i) {
-      result.push(faker.internet.ip());
+      result.push(
+        Math.random() > 0.5 ? faker.internet.ip() : faker.internet.ipv6(),
+      );
     }
     return result;
   },
diff --git a/addons/api/mirage/generated/factories/host.js b/addons/api/mirage/generated/factories/host.js
index 36a5defb5..2154cd582 100644
--- a/addons/api/mirage/generated/factories/host.js
+++ b/addons/api/mirage/generated/factories/host.js
@@ -16,6 +16,9 @@ export default Factory.extend({
   updated_time: () => faker.date.recent(),
   version: () => faker.number.int(),
   attributes: () => {
-    return { address: faker.internet.ipv6() };
+    return {
+      address:
+        Math.random() > 0.5 ? faker.internet.ip() : faker.internet.ipv6(),
+    };
   },
 });