diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
index d43d261ad6c3f..44a25fcaebd9a 100644
--- a/src/bootstrap/src/core/build_steps/llvm.rs
+++ b/src/bootstrap/src/core/build_steps/llvm.rs
@@ -456,11 +456,24 @@ impl Step for Llvm {
         // This is an experimental flag, which likely builds more than necessary.
         // We will optimize it when we get closer to releasing it on nightly.
         if builder.config.llvm_offload {
+            //enabled_llvm_projects.push("lld");
             enabled_llvm_runtimes.push("offload");
             //FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp.
             //Remove this line once they achieved it.
-            enabled_llvm_runtimes.push("openmp");
-            enabled_llvm_projects.push("compiler-rt");
+            //enabled_llvm_runtimes.push("openmp");
+            //enabled_llvm_runtimes.push("compiler-rt");
+
+            //  -DRUNTIMES_CMAKE_ARGS="-DLIBOMPTARGET_PLUGINS_TO_BUILD=amdgpu;nvptx;
+            //cfg.define("RUNTIMES_CMAKE_ARGS", "-DLIBOMPTARGET_PLUGINS_TO_BUILD=amdgpu;nvptx");
+            //cfg.define("LLVM_TARGETS_TO_BUILD", "host;AMDGPU;NVPTX");
+
+            //let runtime_targets = vec!["default", "amdgcn-amd-amdhsa", "nvptx64-nvidia-cuda"];
+            //cfg.define("LLVM_RUNTIME_TARGETS", runtime_targets.join(";"));
+
+            cfg.define("LLVM_INCLUDE_TESTS", "OFF");
+            cfg.define("LLVM_BUILD_TESTS", "OFF");
+            //cfg.define("RUNTIMES_nvptx64-nvidia-cuda_LLVM_ENABLE_RUNTIMES", "openmp");
+            //cfg.define("RUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES", "openmp");
         }
 
         if !enabled_llvm_projects.is_empty() {
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
index cb57478761994..ba62750643d4c 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@@ -90,6 +90,7 @@ ENV RUST_CONFIGURE_ARGS \
       --set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
       --set llvm.thin-lto=true \
       --set llvm.ninja=false \
+      --set llvm.offload=true \
       --set llvm.libzstd=true \
       --set rust.jemalloc \
       --set rust.bootstrap-override-lld=true \