diff --git a/Dockerfile b/Dockerfile
index 2295bb8..0f05649 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------------------
 # Builder Stage
 # ------------------------------------------------------------------------------
-FROM golang:1.18-buster AS build
+FROM golang:1.18-bullseye AS build
 
 WORKDIR /build
 ADD . /build
@@ -12,12 +12,19 @@ RUN make build
 # ------------------------------------------------------------------------------
 # Release Stage
 # ------------------------------------------------------------------------------
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 RUN \
   apt-get update && \
-  apt-get install -y ca-certificates openssl postgresql netcat && \
-  update-ca-certificates && \
+  apt-get install -y ca-certificates openssl netcat curl gnupg lsb-release && \
+  update-ca-certificates
+
+RUN \
+  curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add && \
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list && \
+  apt-get update && apt-get install -y postgresql-client
+
+RUN \
   apt-get clean autoclean && \
   apt-get autoremove --yes && \
   rm -rf /var/lib/{apt,dpkg,cache,log}/