diff --git a/Jenkinsfile b/Jenkinsfile
index 2870cb1e5..df829df1c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ timestamps {
       string(name: 'branch', value: 'main'),
       string(name: 'client_git_commit', value: scmInfo.GIT_COMMIT),
       string(name: 'client_git_branch', value: scmInfo.GIT_BRANCH),
-      string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'dotnet-ubuntu204-net8'),
+      string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'dotnet-ubuntu204-net9'),
       string(name: 'parent_job', value: env.JOB_NAME),
       string(name: 'parent_build_number', value: env.BUILD_NUMBER)
     ]
diff --git a/ci/_init.sh b/ci/_init.sh
index 1b8314100..0df62eb9e 100755
--- a/ci/_init.sh
+++ b/ci/_init.sh
@@ -21,11 +21,11 @@ BUILD_IMAGE_VERSION=1
 TEST_IMAGE_VERSION=1
 
 declare -A BUILD_IMAGE_NAMES=(
-    [$DRIVER_NAME-ubuntu204-net8]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net8-build:$BUILD_IMAGE_VERSION
+    [$DRIVER_NAME-ubuntu204-net9]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net9-build:$BUILD_IMAGE_VERSION
 )
 export BUILD_IMAGE_NAMES
 
 declare -A TEST_IMAGE_NAMES=(
-    [$DRIVER_NAME-ubuntu204-net8]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net8-test:$TEST_IMAGE_VERSION
+    [$DRIVER_NAME-ubuntu204-net9]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net9-test:$TEST_IMAGE_VERSION
 )
 export TEST_IMAGE_NAMES
diff --git a/ci/image/Dockerfile.dotnet-ubuntu204-net8-build b/ci/image/Dockerfile.dotnet-ubuntu204-net8-build
index a50523142..c23822539 100644
--- a/ci/image/Dockerfile.dotnet-ubuntu204-net8-build
+++ b/ci/image/Dockerfile.dotnet-ubuntu204-net8-build
@@ -39,7 +39,7 @@ RUN apt-get install -y dotnet-sdk-8.0
 
 # gosu
 RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.14/gosu-$(dpkg --print-architecture)" && \
-chmod +x /usr/local/bin/gosu && \
+chmod +x /usr/local/bin/gosu
 
 # clean up
 RUN apt-get clean
diff --git a/ci/image/Dockerfile.dotnet-ubuntu204-net9-build b/ci/image/Dockerfile.dotnet-ubuntu204-net9-build
new file mode 100644
index 000000000..011f20d6c
--- /dev/null
+++ b/ci/image/Dockerfile.dotnet-ubuntu204-net9-build
@@ -0,0 +1,56 @@
+# Use the official Ubuntu base image from Docker Hub
+FROM ubuntu:20.04
+
+USER root
+WORKDIR /
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# create dir for workspace
+RUN mkdir -p /home/user
+RUN chmod 777 /home/user
+
+# Update packages and install any desired dependencies
+RUN apt-get update
+RUN apt-get install -y
+RUN apt-get install -y wget
+RUN apt-get install -y apt-transport-https
+RUN apt-get install -y build-essential
+RUN apt-get install -y libpng-dev
+RUN apt-get install -y libtiff-dev
+RUN apt-get install -y libjpeg-dev
+RUN apt-get install -y libx11-dev
+RUN apt-get install -y libgl1-mesa-dev
+RUN apt-get install -y libglu1-mesa-dev
+RUN apt-get install -y gcc
+RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+RUN dpkg -i packages-microsoft-prod.deb
+
+#  install basic tools
+RUN apt-get install -y git
+RUN apt-get install -y zstd
+RUN apt-get install -y jq
+
+# Install .NET SDK 9.0
+RUN apt-get update
+RUN apt-get install -y dotnet-sdk-6.0
+RUN apt-get install -y dotnet-sdk-8.0
+RUN apt-get install -y dotnet-sdk-9.0
+
+# gosu
+RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.14/gosu-$(dpkg --print-architecture)" && \
+chmod +x /usr/local/bin/gosu
+
+# clean up
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/*
+
+# workspace
+RUN mkdir -p /home/user && \
+chmod 777 /home/user
+WORKDIR /home/user
+
+# entry point
+COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/ci/image/Dockerfile.dotnet-ubuntu204-net9-test b/ci/image/Dockerfile.dotnet-ubuntu204-net9-test
new file mode 100644
index 000000000..b4dffdb60
--- /dev/null
+++ b/ci/image/Dockerfile.dotnet-ubuntu204-net9-test
@@ -0,0 +1 @@
+FROM nexus.int.snowflakecomputing.com:8086/docker/client-dotnet-ubuntu204-net9-build:1