diff --git a/.github/workflows/build-cva6-gcc.yml b/.github/workflows/build-cva6-gcc.yml
index b51f0fb..5110238 100644
--- a/.github/workflows/build-cva6-gcc.yml
+++ b/.github/workflows/build-cva6-gcc.yml
@@ -21,7 +21,10 @@ jobs:
 
     - name: Fetch and Build Toolchain
       run: |
-        cd cva6/util/toolchain-builder
+        cd cva6
+        export INSTALL_DIR=$(pwd)/custom_toolchain_build
+        cd util/toolchain-builder
+        echo "INSTALL_DIR: $INSTALL_DIR"
         bash get-toolchain.sh
         bash build-toolchain.sh $INSTALL_DIR
 
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
deleted file mode 100644
index b8d6c84..0000000
--- a/.github/workflows/build-docker.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Build Docker image and publish to GHCR.
-name: build-docker
-on:
-  push:
-    branches: [main]
-  pull_request:
-    paths:
-      - 'Dockerfile'
-  workflow_dispatch:
-  release:
-    types: [published]
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: kuleuven-micas/llvm-build
-jobs:
-  build-docker:
-    name: Deploy Docker image
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v3
-      - name: GHCR Log-in
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 05f2353..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:24.04 AS toolchain-build
-
-RUN apt-get update && apt-get install -y lsb-release wget software-properties-common gnupg curl && \
-  wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 && rm llvm.sh
-
-RUN apt-get -y install git
-
-# Build MLIR from source
-RUN git clone https://github.com/llvm/llvm-project.git && \
-cd /llvm-project/ && \
-git checkout 98e674c9f16d677d95c67bc130e267fae331e43c
-
-
-RUN apt-get install -y ninja-build cmake clang clang-tools lld
-
-RUN apt-get install libpthread-stubs0-dev
-RUN mkdir /llvm-project/build && \
-cd /llvm-project/build && \
-cmake -G Ninja ../llvm \
-   -DLLVM_ENABLE_PROJECTS=mlir \
-   -DLLVM_TARGETS_TO_BUILD="X86" \
-   -DCMAKE_BUILD_TYPE=Release \
-   -DLLVM_ENABLE_ASSERTIONS=ON \
-   -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ENABLE_LLD=ON && \
-# CCache can drastically speed up further rebuilds, try adding:
-#  -DLLVM_CCACHE_BUILD=ON
-# Optionally, using ASAN/UBSAN can find bugs early in development, enable with:
-# -DLLVM_USE_SANITIZER="Address;Undefined"
-# Optionally, enabling integration tests as well
-# -DMLIR_INCLUDE_INTEGRATION_TESTS=ON
-cmake --build . --target mlir-opt mlir-cpu-runner