diff --git a/vm/mx.vm/ce b/vm/mx.vm/ce
index 17ac29f69726..bcf0695479ad 100644
--- a/vm/mx.vm/ce
+++ b/vm/mx.vm/ce
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/sdk,/truffle,/compiler,/substratevm
-COMPONENTS=cmp,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
+COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-aarch64 b/vm/mx.vm/ce-aarch64
index 17ac29f69726..bcf0695479ad 100644
--- a/vm/mx.vm/ce-aarch64
+++ b/vm/mx.vm/ce-aarch64
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/sdk,/truffle,/compiler,/substratevm
-COMPONENTS=cmp,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
+COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-darwin b/vm/mx.vm/ce-darwin
index 17ac29f69726..bcf0695479ad 100644
--- a/vm/mx.vm/ce-darwin
+++ b/vm/mx.vm/ce-darwin
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/sdk,/truffle,/compiler,/substratevm
-COMPONENTS=cmp,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
+COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-darwin-aarch64 b/vm/mx.vm/ce-darwin-aarch64
index 17ac29f69726..bcf0695479ad 100644
--- a/vm/mx.vm/ce-darwin-aarch64
+++ b/vm/mx.vm/ce-darwin-aarch64
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/sdk,/truffle,/compiler,/substratevm
-COMPONENTS=cmp,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
+COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-win b/vm/mx.vm/ce-win
index 17ac29f69726..bcf0695479ad 100644
--- a/vm/mx.vm/ce-win
+++ b/vm/mx.vm/ce-win
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/sdk,/truffle,/compiler,/substratevm
-COMPONENTS=cmp,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
+COMPONENTS=cmp,gvm,lg,ni,nic,nil,sdkni,svm,svmt,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index d9becee37a35..9851fec33930 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -138,7 +138,7 @@ def local_path_to_url(args):
 llvm_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang-cl', 'bgraalvm-native-clang++', 'bgraalvm-native-flang', 'bgraalvm-native-ld']
 
 # pylint: disable=line-too-long
-ce_unchained_components = ['bnative-image-configure', 'cmp', 'lg', 'ni', 'nic', 'nil', 'nr_lib_jvmcicompiler', 'sdkc', 'sdkni', 'svm', 'svmsl', 'svmt', 'tflc', 'tflsm']
+ce_unchained_components = ['bnative-image-configure', 'cmp', 'gvm', 'lg', 'ni', 'nic', 'nil', 'nr_lib_jvmcicompiler', 'sdkc', 'sdkni', 'svm', 'svmsl', 'svmt', 'tflc', 'tflsm']
 ce_components_minimal = ['bpolyglot', 'cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'polynative', 'pro', 'sdk', 'sdkni', 'sdkc', 'sdkl', 'spolyglot', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json']
 ce_components = ce_components_minimal + ['nr_lib_jvmcicompiler', 'bnative-image-configure', 'ni', 'nic', 'nil', 'svm', 'svmt', 'svmnfi', 'svmsl']
 ce_python_components = ['antlr4', 'sllvmvm', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gvm', 'icu4j', 'xz', 'ins', 'insight', 'insightheap', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrlf', 'llrn', 'lsp', 'nfi-libffi', 'nfi', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'sdkni', 'sdkc', 'sdkl', 'spolyglot', 'tfl', 'tfla', 'tflc', 'tflm', 'truffle-json']