diff --git a/Dockerfile b/Dockerfile
index d65db80..0634f98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM tgrogers/accel-sim_regress:Ubuntu-22.04-cuda-11.7
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 
@@ -11,6 +11,19 @@ ENV GPUAPPS_ROOT /accel-sim/gpu-app-collection
 ENV LLVM_INSTALL_PATH /accel-sim/llvm-install
 ENV RISCV_TOOLCHAIN_INSTALL_PATH /accel-sim/riscv-gnu-install
 
+# Install CUDA
+RUN apt-get update \
+&& apt-get install -y wget build-essential xutils-dev bison zlib1g-dev flex \
+      libglu1-mesa-dev git g++ libssl-dev libxml2-dev libboost-all-dev git g++ \
+      libxml2-dev vim python-setuptools python3-pip cmake \
+&& apt-get clean \
+&& pip3 install pyyaml plotly psutil \
+&& wget https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run \
+&& sh cuda_11.7.0_515.43.04_linux.run --silent --toolkit \
+&& rm cuda_11.7.0_515.43.04_linux.run \
+&& rm -rf /usr/local/cuda-11.7/nsight-compute-2022.2.0 \
+&& rm -rf /usr/local/cuda-11.7/nsight-systems-2022.1.3
+
 # Build LLVM 18.1.8
 RUN git clone https://github.com/llvm/llvm-project.git \
 && mkdir llvm-install \
@@ -39,16 +52,16 @@ RUN git clone https://github.com/riscv-collab/riscv-gnu-toolchain.git \
 # Also remove prebuilt x86 binaries
 # Also remove all data except for rodinia-2.0
 RUN export PATH=$CUDA_INSTALL_PATH/bin:$PATH \
+&& git clone https://github.com/accel-sim/gpu-app-collection \
 && cd gpu-app-collection \
 && git pull \
-&& git checkout sst_support \ 
+&& git checkout sst_support \
 && source ./src/setup_environment sst \
-&& rm gpucomputingsdk_4.2.9_linux.run \
-&& rm -rf 4.2 \
-&& rm -rf ./bin \
+&& make -j -C ./src data \
 && mv ./data_dirs/cuda/rodinia/2.0-ft . \
 && rm -rf ./data_dirs \
 && mkdir -p ./data_dirs/cuda/rodinia/ \
 && mv ./2.0-ft ./data_dirs/cuda/rodinia/ \
 && ls ./data_dirs/cuda/rodinia/ \
-&& cd ..
+&& rm gpucomputingsdk_4.2.9_linux.run \
+&& rm -rf 4.2