diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
index d953a93efdff..1ada832ea952 100644
--- a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
+++ b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
@@ -149,9 +149,9 @@ public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String
     }
 
     public static String getIgroupName(String svmName, String hostUuid) {
-        //Igroup name format: cs_svmName_hostUuid
+        //Igroup name format: cs_hostUuid_svmName
         String sanitizedHostUuid = hostUuid.replaceAll("[^a-zA-Z0-9_-]", "_");
-        String igroupName = OntapStorageConstants.CS + OntapStorageConstants.UNDERSCORE + svmName + OntapStorageConstants.UNDERSCORE + sanitizedHostUuid;
+        String igroupName = OntapStorageConstants.CS + OntapStorageConstants.UNDERSCORE + sanitizedHostUuid + OntapStorageConstants.UNDERSCORE + svmName;
         // ONTAP igroup names are limited to 96 characters; truncate if longer.
         if (igroupName.length() > OntapStorageConstants.IGROUP_NAME_MAX_LENGTH) {
             igroupName = igroupName.substring(0, OntapStorageConstants.IGROUP_NAME_MAX_LENGTH);
diff --git a/plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java b/plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java
index 1772b92ed179..372a75ad257d 100644
--- a/plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java
+++ b/plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java
@@ -29,7 +29,7 @@ public class OntapStorageUtilsTest {
     public void getIgroupName_returnsExpectedFormat_whenWithinLimit() {
         String result = OntapStorageUtils.getIgroupName("svm1", "host-uuid-123");
 
-        assertEquals("cs_svm1_host-uuid-123", result);
+        assertEquals("cs_host-uuid-123_svm1", result);
         assertTrue(result.length() <= OntapStorageConstants.IGROUP_NAME_MAX_LENGTH);
     }
 
@@ -38,12 +38,12 @@ public void getIgroupName_sanitizesInvalidCharacters() {
         // Characters outside [a-zA-Z0-9_-] in the host uuid must be replaced with '_'.
         String result = OntapStorageUtils.getIgroupName("svm1", "host.uuid:123/abc");
 
-        assertEquals("cs_svm1_host_uuid_123_abc", result);
+        assertEquals("cs_host_uuid_123_abc_svm1", result);
     }
 
     @Test
     public void getIgroupName_doesNotTruncate_whenExactlyAtMaxLength() {
-        // Format: cs(2) + _(1) + svmName + _(1) + hostUuid
+        // Format: cs(2) + _(1) + hostUuid + _(1) + svmName
         // For an overall length of 96 with a 4-char uuid, svmName must be 88 chars.
         String svmName = "a".repeat(88);
         String hostUuid = "uuid";
@@ -51,7 +51,7 @@ public void getIgroupName_doesNotTruncate_whenExactlyAtMaxLength() {
         String result = OntapStorageUtils.getIgroupName(svmName, hostUuid);
 
         assertEquals(OntapStorageConstants.IGROUP_NAME_MAX_LENGTH, result.length());
-        assertEquals("cs_" + svmName + "_" + hostUuid, result);
+        assertEquals("cs_" + hostUuid + "_" + svmName, result);
     }
 
     @Test
@@ -63,7 +63,7 @@ public void getIgroupName_truncates_whenExceedingMaxLength() {
 
         assertEquals(OntapStorageConstants.IGROUP_NAME_MAX_LENGTH, result.length());
         // The truncated value must still be a prefix of the full, untruncated name.
-        String fullName = "cs_" + svmName + "_" + hostUuid;
+        String fullName = "cs_" + hostUuid + "_" + svmName;
         assertEquals(fullName.substring(0, OntapStorageConstants.IGROUP_NAME_MAX_LENGTH), result);
         assertTrue(result.startsWith("cs_"));
     }
@@ -71,7 +71,7 @@ public void getIgroupName_truncates_whenExceedingMaxLength() {
     @Test
     public void getIgroupName_truncates_whenOneCharOverMaxLength() {
         // Build a name that is exactly one character over the limit (97 chars):
-        // svmName of 89 chars + 4-char uuid -> 2 + 1 + 89 + 1 + 4 = 97.
+        // svmName of 89 chars + 4-char uuid -> 2 + 1 + 4 + 1 + 89 = 97.
         String svmName = "a".repeat(89);
         String hostUuid = "uuid";