diff --git a/docker-builders/Makefile b/docker-builders/Makefile
index dae233b0..ef4e7b42 100644
--- a/docker-builders/Makefile
+++ b/docker-builders/Makefile
@@ -1,18 +1,32 @@
 
+KOMPUTE_BUILDER_VERSION=0.4
+SWIFTSHADER_VERSION=0.2
+VULKAN_SDK_VERSION=1.3.231.2
+
 build_kompute_builder:
-	docker build .. -f KomputeBuilder.Dockerfile -t axsauze/kompute-builder:0.3
+	docker build .. \
+		-f KomputeBuilder.Dockerfile \
+		--build-arg VULKAN_SDK_VERSION=$(VULKAN_SDK_VERSION) \
+		--build-arg SWIFTSHADER_VERSION=$(SWIFTSHADER_VERSION) \
+		-t axsauze/kompute-builder:${KOMPUTE_BUILDER_VERSION}
 
-push_kompute_builder: build_kompute_builder
-	docker push axsauze/kompute-builder:0.3
+push_kompute_builder:
+	docker push axsauze/kompute-builder:${KOMPUTE_BUILDER_VERSION}
 
 build_swiftshader:
-	docker build .. -f Swiftshader.Dockerfile -t axsauze/swiftshader:0.1
+	docker build .. \
+		-f Swiftshader.Dockerfile \
+		--build-arg VULKAN_SDK_VERSION=$(VULKAN_SDK_VERSION) \
+		-t axsauze/swiftshader:${SWIFTSHADER_VERSION}
 
-push_swiftshader: build_swiftshader
-	docker push axsauze/swiftshader:0.1
+push_swiftshader:
+	docker push axsauze/swiftshader:${SWIFTSHADER_VERSION}
 
 build_vulkan_sdk:
-	docker build .. -f VulkanSDK.Dockerfile -t axsauze/vulkan-sdk:0.1
+	docker build .. \
+		-f VulkanSDK.Dockerfile \
+		--build-arg VULKAN_SDK_VERSION=$(VULKAN_SDK_VERSION) \
+		-t axsauze/vulkan-sdk:${VULKAN_SDK_VERSION}
 
-push_vulkan_sdk: build_vulkan_sdk
-	docker push axsauze/vulkan-sdk:0.1
+push_vulkan_sdk:
+	docker push axsauze/vulkan-sdk:${VULKAN_SDK_VERSION}