diff --git a/ci/occt.Dockerfile b/ci/occt.Dockerfile
index fde0024..7a6de04 100644
--- a/ci/occt.Dockerfile
+++ b/ci/occt.Dockerfile
@@ -1,5 +1,4 @@
-# Base builder
-FROM ubuntu:24.04 AS base
+FROM ubuntu:24.04 AS occt-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -84,10 +83,9 @@ COPY src/occt/ ./src
 RUN cmake -S src -B build -DCMAKE_PREFIX_PATH=/usr/local
 RUN cmake --build build
 
-COPY test/occt/ ./test
+COPY tests/occt/ ./test
 
-# Unit test runner stage
-FROM ubuntu:24.04 AS unit-testing
+FROM ubuntu:24.04 AS occt-unit-testing
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -98,12 +96,10 @@ RUN apt-get update && apt-get install -y \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
 
-COPY --from=base /usr/local /usr/local
-COPY --from=base /app/build /app/build
-COPY --from=base /app/src /app/src
-COPY --from=base /app/test /app/test
-COPY --from=base /usr/local/include /usr/local/include
-COPY --from=base /usr/local/lib /usr/local/lib
+COPY --from=occt-base /usr/local /usr/local
+COPY --from=occt-base /app/build /app/build
+COPY --from=occt-base /app/src /app/src
+COPY --from=occt-base /app/test /app/test
 
 WORKDIR /app
 
diff --git a/ci/scripts/occt.sh b/ci/scripts/occt.sh
index 17d260f..80b83bc 100644
--- a/ci/scripts/occt.sh
+++ b/ci/scripts/occt.sh
@@ -12,11 +12,11 @@ if [[ "${1-}" == "--unit-testing" ]]; then
 fi
 
 echo "Building base image..."
-docker build --target base -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" "$PROJECT_PATH"
+docker build --target occt-base -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" "$PROJECT_PATH"
 
 if [ "$RUN_UNIT_TESTS" = true ]; then
     echo "Building unit-testing stage..."
-    docker build --target unit-testing -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" "$PROJECT_PATH"
+    docker build --target occt-unit-testing -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" "$PROJECT_PATH"
 
     echo "Running unit tests..."
     docker run --rm "$IMAGE_NAME" /app/build/unit-tests/tests