diff --git a/arch/AArch64/AArch64GenCSMappingInsn.inc b/arch/AArch64/AArch64GenCSMappingInsn.inc
index 3d733685..f0fc128e 100644
--- a/arch/AArch64/AArch64GenCSMappingInsn.inc
+++ b/arch/AArch64/AArch64GenCSMappingInsn.inc
@@ -29070,7 +29070,7 @@
   /* hvc	$imm */
   AArch64_HVC /* 3813 */, AARCH64_INS_HVC,
   #ifndef CAPSTONE_DIET
-    { 0 }, { 0 }, { 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
+    { 0 }, { 0 }, { AARCH64_GRP_CALL, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
   #endif
 },
@@ -43350,7 +43350,7 @@
   /* smc	$imm */
   AArch64_SMC /* 5598 */, AARCH64_INS_SMC,
   #ifndef CAPSTONE_DIET
-    { 0 }, { 0 }, { AARCH64_FEATURE_HASEL3, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
+    { 0 }, { 0 }, { AARCH64_GRP_CALL, AARCH64_FEATURE_HASEL3, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
   #endif
 },
@@ -54582,7 +54582,7 @@
   /* svc	$imm */
   AArch64_SVC /* 7002 */, AARCH64_INS_SVC,
   #ifndef CAPSTONE_DIET
-    { 0 }, { 0 }, { 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
+    { 0 }, { 0 }, { AARCH64_GRP_CALL, 0 }, 0, 0, { .aarch64 = { .mem_acc = CS_AC_INVALID }}
 
   #endif
 },
diff --git a/tests/issues/issues.yaml b/tests/issues/issues.yaml
index cdac2171..b0096101 100644
--- a/tests/issues/issues.yaml
+++ b/tests/issues/issues.yaml
@@ -5840,3 +5840,43 @@ test_cases:
               - type: MIPS_OP_IMM
                 imm: 0
                 access: CS_AC_READ
+
+  -
+    input:
+      name: "issue 2630 - missing call group for svc, hvc, smc."
+      bytes: [ 0xc2, 0x00, 0x00, 0xd4 ]
+      arch: "CS_ARCH_AARCH64"
+      options: [ CS_OPT_DETAIL ]
+      address: 0x0
+    expected:
+      insns:
+      -
+        asm_text: "hvc #0x6"
+        details:
+          groups: [ call ]
+  -
+    input:
+      name: "issue 2630 - missing call group for svc, hvc, smc."
+      bytes: [ 0xe3, 0x00, 0x00, 0xd4 ]
+      arch: "CS_ARCH_AARCH64"
+      options: [ CS_OPT_DETAIL ]
+      address: 0x0
+    expected:
+      insns:
+      -
+        asm_text: "smc #0x7"
+        details:
+          groups: [ call, HasEL3, privilege ]
+  -
+    input:
+      name: "issue 2630 - missing call group for svc, hvc, smc."
+      bytes: [ 0x01, 0x01, 0x00, 0xd4 ]
+      arch: "CS_ARCH_AARCH64"
+      options: [ CS_OPT_DETAIL ]
+      address: 0x0
+    expected:
+      insns:
+      -
+        asm_text: "svc #0x8"
+        details:
+          groups: [ call, int ]