diff --git a/blender-kernel.sh b/blender-kernel.sh
index 972dc68..16df03c 100644
--- a/blender-kernel.sh
+++ b/blender-kernel.sh
@@ -1,5 +1,5 @@
 # Original
-cd /home/rocm/blender/build/intern/cycles/kernel && \
+/bin/sh -c cd /home/rocm/blender/build/intern/cycles/kernel && \
 /usr/bin/hipcc \
     --amdgpu-target=gfx803 \
     --genco /home/rocm/blender/intern/cycles/kernel/device/hip/kernel.cpp \
@@ -8,23 +8,38 @@ cd /home/rocm/blender/build/intern/cycles/kernel && \
     -D HIPCC \
     -I /home/rocm/blender/intern/cycles/kernel/.. \
     -I /home/rocm/blender/intern/cycles/kernel/device/hip \
+    -Wno-parentheses-equality \
+    -Wno-unused-value \
     --hipcc-func-supp \
     -ffast-math \
-    -o /home/rocm/blender/build/intern/cycles/kernel/kernel_gfx803.fatbin \
-    -D WITH_NANOVDB \
-    -I /home/rocm/blender/lib/linux_x64/openvdb/include
+    -o /home/rocm/blender/build/intern/cycles/kernel/kernel_gfx803.fatbin
 
-# > https://projects.blender.org/blender/blender/issues/112084
-hipcc \
-    --offload-arch=<your-arch> \
-    --genco intern/cycles/kernel/device/hip/kernel.cpp \
+# > https://github.com/ROCm/llvm-project/issues/58
+/usr/bin/hipcc \
+    --offload-arch=gfx803 \
+    --genco /home/rocm/blender/intern/cycles/kernel/device/hip/kernel.cpp \
     -D CCL_NAMESPACE_BEGIN= \
     -D CCL_NAMESPACE_END= \
     -D HIPCC \
-    -I intern/cycles/kernel/.. \
-    -I intern/cycles/kernel/device/hip \
+    -I /home/rocm/blender/intern/cycles/kernel/.. \
+    -I /home/rocm/blender/intern/cycles/kernel/device/hip \
+    -Wno-parentheses-equality \
+    -Wno-unused-value \
+    -O1 \
     -ffast-math \
-    -o kernel_<your_arch>.fatbin \
+    -o /home/rocm/blender/build/intern/cycles/kernel/kernel_gfx803.fatbin
+
+# > https://projects.blender.org/blender/blender/issues/112084
+hipcc \
+    --offload-arch=gfx803 \
+    --genco /home/rocm/blender/intern/cycles/kernel/device/hip/kernel.cpp \
+    -D CCL_NAMESPACE_BEGIN= \
+    -D CCL_NAMESPACE_END= \
+    -D HIPCC \
+    -I /home/rocm/blender/intern/cycles/kernel/.. \
+    -I /home/rocm/blender/intern/cycles/kernel/device/hip \
+    -ffast-math \
+    -o kernel_gfx803.fatbin \
     -mcode-object-version=4 \
     -Xclang \
     -mcode-object-version=4
@@ -36,6 +51,6 @@ hipcc \
     -Wno-unused-value \
     -O3 \
     --amdgpu-target=gfx803 \
-    -I /home/work/blender-git/blender/intern/cycles \
-    --genco /home/work/blender-git/blender/intern/cycles/kernel/device/hip/kernel.cpp \
-    -o "/home/work/blender-git/build_linux_cycles/bin/lib/kernel_gfx803.fatbin"
\ No newline at end of file
+    -I /home/rocm/blender/intern/cycles \
+    --genco /home/rocm/blender/intern/cycles/kernel/device/hip/kernel.cpp \
+    -o kernel_gfx803.fatbin
diff --git a/blender.dockerfile b/blender.dockerfile
index 14a6245..51eb988 100644
--- a/blender.dockerfile
+++ b/blender.dockerfile
@@ -34,6 +34,7 @@ WORKDIR /home/rocm/blender/build
 RUN cmake \
 -DWITH_CYCLES_HIP_BINARIES=ON \
 -DCYCLES_HIP_BINARIES_ARCH=${HIP_ARCH} \
+-DWITH_NANOVDB=OFF \
 ..
 RUN make -j$(nproc)
 RUN cpack -G TXZ