diff --git a/package/Dockerfile b/package/Dockerfile
index 61c31b1..f400e46 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 RUN sed -i 's:^path-exclude=/usr/share/man:#path-exclude=/usr/share/man:' /etc/dpkg/dpkg.cfg.d/excludes
 RUN apt-get update && \
     export DEBIAN_FRONTEND=noninteractive && \
@@ -14,7 +14,6 @@ RUN apt-get update && \
         iperf \
         iperf3 \
         iproute2 \
-        ipsec-tools \
         ipset \
         iptables \
         iputils-ping \
@@ -43,7 +42,6 @@ RUN apt-get update && \
         vim \
         wget && \
     rm -rf /var/lib/apt/lists/* && \
-    mv /usr/sbin/tcpdump /usr/bin/tcpdump && \
     mv /usr/sbin/traceroute /usr/bin/traceroute && \
     curl -sLf https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 > /usr/bin/docker && \
     chmod +x /usr/bin/docker && \
diff --git a/scripts/version b/scripts/version
index f7f6530..5c8bfaf 100755
--- a/scripts/version
+++ b/scripts/version
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -x
+
 # version.env file needs to be generated and sourced in
 # downstream steps as some of the images don't have git
 # and other necessary commands available
@@ -36,4 +38,4 @@ export VERSION=${VERSION}
 export IMAGE_VERSION=${IMAGE_VERSION}
 export ARCH=${ARCH}
 EOT
-echo "Generated version.env"
\ No newline at end of file
+echo "Generated version.env"