diff --git a/README.md b/README.md
index 0f3c44a..60f00b6 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,8 @@ This project uses [Llama.cpp](https://github.com/ggerganov/llama.cpp), a high-pe
 | `rocm-7beta`    | ROCm 7.0 Beta (HIP) | Latest ROCm beta. No real improvement for Llama.cpp. Similar model limits to 6.4.2.   |
 | `rocm-7rc`      | ROCm 7.0 RC (HIP)   | Release candidate ROCm 7.0. Same behavior as above.                                   |
 
+You can also check the containers on DockerHub: https://hub.docker.com/r/kyuz0/amd-strix-halo-toolboxes/tags.
+
 > *Each container is based on Fedora Rawhide and is built for maximum compatibility and performance on Strix Halo.*
 
 ---
diff --git a/docs/building.md b/docs/building.md
index e699907..af3f888 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -24,14 +24,14 @@ Each backend has its own subdirectory and Dockerfile in `toolboxes/`.
 
 ```sh
 cd toolboxes
-podman build -t llama-vulkan-radv Dockerfile.vulkan-radv
+podman build -t llama-vulkan-radv -f Dockerfile.vulkan-radv .
 ```
 
 **Example: Build the ROCm 6.4.2 toolbox image**
 
 ```sh
 cd ../rocm-6.4.2
-podman build -t llama-rocm-6.4.2 Dockerfile.rocm-6.4.2
+podman build -t llama-rocm-6.4.2 -f Dockerfile.rocm-6.4.2 .
 ```
 
 > You can use `docker build` if you prefer Docker.
diff --git a/docker-toolboxes/Dockerfile.rocm-6.4.2 b/toolboxes/Dockerfile.rocm-6.4.2
similarity index 100%
rename from docker-toolboxes/Dockerfile.rocm-6.4.2
rename to toolboxes/Dockerfile.rocm-6.4.2
diff --git a/docker-toolboxes/Dockerfile.rocm-7beta b/toolboxes/Dockerfile.rocm-7beta
similarity index 100%
rename from docker-toolboxes/Dockerfile.rocm-7beta
rename to toolboxes/Dockerfile.rocm-7beta
diff --git a/docker-toolboxes/Dockerfile.rocm-7rc b/toolboxes/Dockerfile.rocm-7rc
similarity index 100%
rename from docker-toolboxes/Dockerfile.rocm-7rc
rename to toolboxes/Dockerfile.rocm-7rc
diff --git a/docker-toolboxes/Dockerfile.vulkan-amdvlk b/toolboxes/Dockerfile.vulkan-amdvlk
similarity index 95%
rename from docker-toolboxes/Dockerfile.vulkan-amdvlk
rename to toolboxes/Dockerfile.vulkan-amdvlk
index 79c8a10..b53c493 100644
--- a/docker-toolboxes/Dockerfile.vulkan-amdvlk
+++ b/toolboxes/Dockerfile.vulkan-amdvlk
@@ -4,7 +4,7 @@ FROM fedora:rawhide
 RUN dnf install -y \
       git vim \
       make gcc cmake ninja-build lld clang clang-devel compiler-rt libcurl-devel \
-      vulkan-loader-devel mesa-vulkan-drivers \
+      vulkan-loader-devel vulkaninfo mesa-vulkan-drivers \
       radeontop glslc wget \
     && dnf clean all
 
diff --git a/docker-toolboxes/Dockerfile.vulkan-radv b/toolboxes/Dockerfile.vulkan-radv
similarity index 93%
rename from docker-toolboxes/Dockerfile.vulkan-radv
rename to toolboxes/Dockerfile.vulkan-radv
index 0b46a25..b9e395f 100644
--- a/docker-toolboxes/Dockerfile.vulkan-radv
+++ b/toolboxes/Dockerfile.vulkan-radv
@@ -4,7 +4,7 @@ FROM fedora:rawhide
 RUN dnf install -y \
       git vim \
       make gcc cmake ninja-build lld clang clang-devel compiler-rt libcurl-devel \
-      vulkan-loader-devel mesa-vulkan-drivers \
+      vulkan-loader-devel vulkaninfo mesa-vulkan-drivers \
       radeontop glslc \
     && dnf clean all
 
diff --git a/docker-toolboxes/gguf-vram-estimator.py b/toolboxes/gguf-vram-estimator.py
similarity index 100%
rename from docker-toolboxes/gguf-vram-estimator.py
rename to toolboxes/gguf-vram-estimator.py
diff --git a/docker-toolboxes/hip-rocm7rc.patch b/toolboxes/hip-rocm7rc.patch
similarity index 100%
rename from docker-toolboxes/hip-rocm7rc.patch
rename to toolboxes/hip-rocm7rc.patch