diff --git a/cf-acceptance-tests/Dockerfile b/cf-acceptance-tests/Dockerfile
index 181a4727..388bea78 100644
--- a/cf-acceptance-tests/Dockerfile
+++ b/cf-acceptance-tests/Dockerfile
@@ -5,7 +5,7 @@ RUN apt update \
       build-essential \
       openssh-client \
       unzip \
-      python-pip \
+      python3-pip \
       jq \
       git \
       fossil \
@@ -40,4 +40,4 @@ ENV CF_PLUGIN_HOME /root/
 RUN cf install-plugin -f "https://github.com/cloudfoundry/log-cache-cli/releases/download/v${CF_LOG_CACHE_VERSION}/log-cache-cf-plugin-linux"
 
 # Install the AWS-CLI
-RUN pip install awscli=="1.19.112"
+RUN pip install awscli=="1.29.79"
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 0f831a08..a89c6946 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update \