diff --git a/docker-builders/KomputeBuilder.Dockerfile b/docker-builders/KomputeBuilder.Dockerfile
index 3f3146f..2dd6575 100644
--- a/docker-builders/KomputeBuilder.Dockerfile
+++ b/docker-builders/KomputeBuilder.Dockerfile
@@ -15,14 +15,14 @@ RUN apt-get update -y
 RUN apt-get install -y cmake g++
 RUN apt-get install -y libvulkan-dev
 RUN apt-get install -y git
+RUN apt-get install -y g++-8 gcc-8
 
-RUN mkdir builder
-WORKDIR /builder
-RUN git clone 
-
-RUN wget https://www.dropbox.com/s/d0weho6l8dovm71/libvk_swiftshader.so?dl=1 -O /usr/lib/libvk_swiftshader.so
-RUN mkdir -p /usr/share/vulkan/icd.d
-RUN wget https://www.dropbox.com/s/5oly49ev3vvcfdu/vk_swiftshader_icd.json?dl=1 -O /usr/share/vulkan/icd.d/vk_swiftshader_icd.json
+# Run swiftshader via env VK_ICD_FILENAMES=/swiftshader/vk_swiftshader_icd.json
+RUN git clone https://github.com/google/swiftshader swiftshader-build
+RUN CC="/usr/bin/gcc-8" CXX="/usr/bin/g++-8" cmake swiftshader/. -Bswiftshader/build/
+RUN cmake --build swiftshader/build/. --parallel
+RUN mv swiftshader/build/Linux/ swiftshader/
+RUN rm -rf swiftshader-build/
 
 RUN mkdir builder
 WORKDIR /builder