diff --git a/Dockerfile b/Dockerfile
index a7c3f934b..1bea01572 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Define image base arg
-ARG IMAGE_VERSION="ubuntu:20.04"
+ARG IMAGE_VERSION="ubuntu:22.04"
 
 # Define base image repo name
 ARG BASE_IMAGE="ghcr.io/mit-dci/opencbdc-tx-base:latest"
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index ab0256d81..d616364f0 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -19,6 +19,8 @@ target_link_libraries(run_benchmarks ${GTEST_LIBRARY}
                                      watchtower
                                      locking_shard
                                      transaction
+                                     rpc
+                                     network
                                      common
                                      serialization
                                      crypto
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 3131fe477..ca539a7eb 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -1,8 +1,9 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 COPY . .
 
 RUN apt update && apt dist-upgrade -y
-RUN ./configure.sh
+RUN ./install-build-tools.sh
+RUN ./setup-dependencies.sh