diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index 536cde90..dc4b4cc5 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -24,7 +24,7 @@ else()
     CPMAddPackage(
         NAME capstone
         GITHUB_REPOSITORY capstone-engine/capstone
-        GIT_TAG 5.0.3
+        GIT_TAG 6.0.0-Alpha1
         EXCLUDE_FROM_ALL TRUE
     )
     add_library(TracyCapstone INTERFACE)
diff --git a/profiler/src/profiler/TracySourceView.cpp b/profiler/src/profiler/TracySourceView.cpp
index cebe9c3e..11f3dbd2 100644
--- a/profiler/src/profiler/TracySourceView.cpp
+++ b/profiler/src/profiler/TracySourceView.cpp
@@ -712,7 +712,7 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
         rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
         break;
     case CpuArchArm64:
-        rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
+        rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
         break;
     default:
         assert( false );
@@ -777,9 +777,9 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
                     }
                     break;
                 case CpuArchArm64:
-                    if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
+                    if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
                     {
-                        jumpAddr = (uint64_t)detail.arm64.operands[0].imm;
+                        jumpAddr = (uint64_t)detail.aarch64.operands[0].imm;
                     }
                     break;
                 default:
@@ -864,18 +864,18 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
                 }
                 break;
             case CpuArchArm64:
-                for( uint8_t i=0; i<detail.arm64.op_count; i++ )
+                for( uint8_t i=0; i<detail.aarch64.op_count; i++ )
                 {
                     uint8_t type = 0;
-                    switch( detail.arm64.operands[i].type )
+                    switch( detail.aarch64.operands[i].type )
                     {
-                    case ARM64_OP_IMM:
+                    case AARCH64_OP_IMM:
                         type = 0;
                         break;
-                    case ARM64_OP_REG:
+                    case AARCH64_OP_REG:
                         type = 1;
                         break;
-                    case ARM64_OP_MEM:
+                    case AARCH64_OP_MEM:
                         type = 2;
                         break;
                     default:
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index ecc93fd7..b22c7443 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -3846,7 +3846,7 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
         rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
         break;
     case CpuArchArm64:
-        rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
+        rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
         break;
     default:
         assert( false );
@@ -3890,9 +3890,9 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
                         }
                         break;
                     case CpuArchArm64:
-                        if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
+                        if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
                         {
-                            callAddr = (uint64_t)detail.arm64.operands[0].imm;
+                            callAddr = (uint64_t)detail.aarch64.operands[0].imm;
                         }
                         break;
                     default: