diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0b89c27..66f5f9e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,15 +14,15 @@ jobs:
       matrix:
         include:
           - name: stock
-          - name: vtk
-            vtk: "True"
+          - name: suite
+            suite: "True"
           - name: python
             python: "True"
-          - name: vtk-python
+          - name: suite-python
             python: "True"
-            vtk: "True"
+            suite: "True"
 
-    name: "🐳 Build Container (🐍: ${{ matrix.python || 'False' }}, 🧰: ${{ matrix.vtk || 'False' }})"
+    name: "🐳 Build Container (🐍: ${{ matrix.python || 'False' }}, 🧰: ${{ matrix.suite || 'False' }})"
 
     steps:
       - name: 📥 Checkout
@@ -40,6 +40,6 @@ jobs:
 
       - name: ♻️ Publish Images
         run: |
-          docker buildx build --tag vienna-builder --build-arg VTK="${{ matrix.vtk || 'False' }}" --build-arg PYTHON="${{ matrix.python || 'False' }}" --load .
+          docker buildx build --tag vienna-builder --build-arg SUITE="${{ matrix.vtk || 'False' }}" --build-arg PYTHON="${{ matrix.python || 'False' }}" --load .
           docker image tag vienna-builder ghcr.io/viennatools/vienna-builder:${{ matrix.name }}
           docker push ghcr.io/viennatools/vienna-builder:${{ matrix.name }}
diff --git a/Dockerfile b/Dockerfile
index 8090c1f..344e799 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:latest
 
 # Arguments
 
-ARG VTK
+ARG SUITE
 ARG PYTHON
 
 # Build dependencies
@@ -10,10 +10,10 @@ ARG PYTHON
 RUN apk add build-base cmake ninja-build musl-dev linux-headers
 RUN apk add git docker sed tar
 
-# Conditionally pre-install VTK
+# Conditionally pre-install common build dependencies
 
-RUN if [ "$VTK" = "True" ]; then \
-        apk add vtk-dev; \ 
+RUN if [ "$SUITE" = "True" ]; then \
+        apk add vtk-dev embree-dev onetbb-dev; \ 
     fi
 
 RUN if [ "$PYTHON" = "True" ]; then \