diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
index e55355fe8f534..c78104c34ad6d 100644
--- a/bazel/foreign_cc/BUILD
+++ b/bazel/foreign_cc/BUILD
@@ -277,45 +277,73 @@ envoy_cmake(
     lib_source = "@org_llvm_llvm//:all",
     out_static_libs = select({
         "//conditions:default": [
-            # Order from llvm-config --libnames asmparser core debuginfodwarf
-            # engine lto mcparser mirparser orcjit passes runtimedyld
-            # support x86asmparser x86desc
+            # This list must be updated when the bazel llvm version is updated
+            # (in `bazel/repository_locations.bzl`)
+            #
+            # The list can be regenerated by compiling the correct/updated llvm version
+            # from sources and running:
+            #
+            #  `llvm-config --libnames`
+            #
+            "libLLVMWindowsManifest.a",
+            "libLLVMXRay.a",
+            "libLLVMLibDriver.a",
+            "libLLVMDlltoolDriver.a",
+            "libLLVMCoverage.a",
+            "libLLVMLineEditor.a",
+            "libLLVMX86Disassembler.a",
+            "libLLVMX86AsmParser.a",
+            "libLLVMX86CodeGen.a",
+            "libLLVMX86Desc.a",
+            "libLLVMX86Info.a",
             "libLLVMOrcJIT.a",
-            "libLLVMOrcError.a",
+            "libLLVMMCJIT.a",
             "libLLVMJITLink.a",
-            "libLLVMMIRParser.a",
+            "libLLVMOrcTargetProcess.a",
+            "libLLVMOrcShared.a",
+            "libLLVMInterpreter.a",
+            "libLLVMExecutionEngine.a",
+            "libLLVMRuntimeDyld.a",
+            "libLLVMSymbolize.a",
+            "libLLVMDebugInfoPDB.a",
+            "libLLVMDebugInfoGSYM.a",
+            "libLLVMOption.a",
+            "libLLVMObjectYAML.a",
+            "libLLVMMCA.a",
+            "libLLVMMCDisassembler.a",
             "libLLVMLTO.a",
             "libLLVMPasses.a",
+            "libLLVMCFGuard.a",
+            "libLLVMCoroutines.a",
             "libLLVMObjCARCOpts.a",
+            "libLLVMHelloNew.a",
             "libLLVMipo.a",
-            "libLLVMInstrumentation.a",
             "libLLVMVectorize.a",
             "libLLVMLinker.a",
-            "libLLVMIRReader.a",
-            "libLLVMX86Disassembler.a",
-            "libLLVMX86AsmParser.a",
-            "libLLVMX86CodeGen.a",
-            "libLLVMCFGuard.a",
+            "libLLVMInstrumentation.a",
+            "libLLVMFrontendOpenMP.a",
+            "libLLVMFrontendOpenACC.a",
+            "libLLVMExtensions.a",
+            "libLLVMDWARFLinker.a",
             "libLLVMGlobalISel.a",
-            "libLLVMSelectionDAG.a",
+            "libLLVMMIRParser.a",
             "libLLVMAsmPrinter.a",
+            "libLLVMDebugInfoDWARF.a",
+            "libLLVMSelectionDAG.a",
             "libLLVMCodeGen.a",
+            "libLLVMIRReader.a",
+            "libLLVMAsmParser.a",
+            "libLLVMInterfaceStub.a",
+            "libLLVMFileCheck.a",
+            "libLLVMFuzzMutate.a",
+            "libLLVMTarget.a",
             "libLLVMScalarOpts.a",
             "libLLVMInstCombine.a",
             "libLLVMAggressiveInstCombine.a",
             "libLLVMTransformUtils.a",
             "libLLVMBitWriter.a",
-            "libLLVMX86Desc.a",
-            "libLLVMMCDisassembler.a",
-            "libLLVMX86Utils.a",
-            "libLLVMX86Info.a",
-            "libLLVMMCJIT.a",
-            "libLLVMExecutionEngine.a",
-            "libLLVMTarget.a",
             "libLLVMAnalysis.a",
             "libLLVMProfileData.a",
-            "libLLVMRuntimeDyld.a",
-            "libLLVMDebugInfoDWARF.a",
             "libLLVMObject.a",
             "libLLVMTextAPI.a",
             "libLLVMMCParser.a",
@@ -323,7 +351,6 @@ envoy_cmake(
             "libLLVMDebugInfoCodeView.a",
             "libLLVMDebugInfoMSF.a",
             "libLLVMBitReader.a",
-            "libLLVMAsmParser.a",
             "libLLVMCore.a",
             "libLLVMRemarks.a",
             "libLLVMBitstreamReader.a",
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index ae5295c721c00..c2b450853d5c1 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -715,14 +715,16 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         use_category = ["other"],
     ),
     org_llvm_llvm = dict(
+        # When changing this, you must re-generate the list of llvm libs
+        # see `bazel/foreign_cc/BUILD` for further information.
         project_name = "LLVM",
         project_desc = "LLVM Compiler Infrastructure",
         project_url = "https://llvm.org",
-        version = "10.0.0",
-        sha256 = "df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf",
+        version = "12.0.1",
+        sha256 = "7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf",
         strip_prefix = "llvm-{version}.src",
         urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-{version}/llvm-{version}.src.tar.xz"],
-        release_date = "2020-03-24",
+        release_date = "2021-07-09",
         use_category = ["dataplane_ext"],
         extensions = [
             "envoy.wasm.runtime.wamr",
@@ -747,11 +749,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "WAVM",
         project_desc = "WebAssembly Virtual Machine",
         project_url = "https://wavm.github.io",
-        version = "79c3aa29366615d9b1593cd527e5b4b94cc6072a",
-        sha256 = "ce899269516313b400005a8cc9bc3bcd8329663f43f7b4baae211ea0cd456a39",
+        version = "9ffd3e2f8dcbbe4e965825c32195bd70d6ebc95d",
+        sha256 = "e4d2d1f53deda4313209b6edceddfc59eb93f367cf3ca41b590ac2e54bb7daf3",
         strip_prefix = "WAVM-{version}",
         urls = ["https://github.com/WAVM/WAVM/archive/{version}.tar.gz"],
-        release_date = "2021-03-31",
+        release_date = "2021-10-16",
         use_category = ["dataplane_ext"],
         extensions = ["envoy.wasm.runtime.wavm"],
         cpe = "cpe:2.3:a:webassembly_virtual_machine_project:webassembly_virtual_machine:*",