diff --git a/Jenkinsfile b/Jenkinsfile
index 8b555cb1c71..af36d2bdff2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -174,7 +174,7 @@ def getParallelTests(String image) {
 
         'Compile with C++20': {
             node {
-                docker.image('openroad/ubuntu-cpp20').inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
+                docker.image(image).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
                     stage('Setup C++20 Compile') {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
                         checkout scm;
diff --git a/docker/Dockerfile.cpp20 b/docker/Dockerfile.cpp20
deleted file mode 100644
index b210bfa067c..00000000000
--- a/docker/Dockerfile.cpp20
+++ /dev/null
@@ -1,13 +0,0 @@
-# create image with all dependencies to compiler openroad app
-# copy source code to the docker image and compile the app
-# NOTE: don't use this file directly unless you know what you are doing,
-# instead use etc/DockerHelper.sh
-
-FROM openroad/ubuntu22.04-dev:latest
-
-# Install clang
-RUN apt-get install -y lsb-release wget software-properties-common gnupg \
-      && wget https://apt.llvm.org/llvm.sh \
-      && chmod +x llvm.sh \
-      && ./llvm.sh 16 all \
-      && rm llvm.sh
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
index 5ac3fd8fcff..7d0d3ac1f01 100755
--- a/etc/DependencyInstaller.sh
+++ b/etc/DependencyInstaller.sh
@@ -666,7 +666,9 @@ _installCI() {
         apt-transport-https \
         ca-certificates \
         curl \
+        gnupg \
         jq \
+        lsb-release \
         parallel \
         software-properties-common
 
@@ -696,6 +698,12 @@ _installCI() {
         docker-ce-cli \
         containerd.io \
         docker-buildx-plugin
+
+    # Install clang for C++20 support
+    wget https://apt.llvm.org/llvm.sh
+    chmod +x llvm.sh
+    ./llvm.sh 16 all
+
 }
 
 _checkIsLocal() {