diff --git a/Dockerfile b/Dockerfile
index 7a38294..2b186f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,24 +6,23 @@ LABEL maintainer="${DOCKER_MAINTAINER}"
 
 RUN set -e && DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
-    apt-get install -y gnupg2 wget iputils-ping curl nano ca-certificates apt-transport-https lsb-release && \
-    echo deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs) main restricted universe multiverse > /etc/apt/sources.list && \
-    echo deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-updates main restricted universe multiverse >> /etc/apt/sources.list && \
-    echo deb http://archive.ubuntu.com/ubuntu $(lsb_release -cs)-security main restricted universe multiverse >> /etc/apt/sources.list
+    apt-get install -y gnupg2 wget iputils-ping curl nano ca-certificates apt-transport-https lsb-release
 
 RUN echo -e "\n====> Install PGSQL + Mysql" && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null && \
-    echo deb [arch=amd64 signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main | tee -a /etc/apt/sources.list.d/postgresql.list && \
-    apt-get update && \
+    rm -f /etc/apt/sources.list.d/pgdg.list && \
+    mkdir -p /usr/share/postgresql-common/pgdg && \
+    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc && \
+    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    apt update && \
     apt-cache search postgresql-client-* && \
-    apt-get install -y postgresql-client-10 postgresql-client-12 postgresql-client-14 mysql-client
+    apt install -y postgresql-client-12 postgresql-client-14 postgresql-client-16 postgresql-client-18 mysql-client
 
 RUN echo -e "\n====> Install Mongo" && \
-    MONGO_VER=4.4 && \
-    wget -qO - https://www.mongodb.org/static/pgp/server-${MONGO_VER}.asc | gpg --dearmor | tee /usr/share/keyrings/mongodb.gpg > /dev/null && \
-        echo deb [arch=amd64 signed-by=/usr/share/keyrings/mongodb.gpg] https://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/${MONGO_VER} multiverse | tee -a /etc/apt/sources.list.d/mongodb-org-${MONGO_VER}.list && \
-    apt-get update && \
-    apt-get install mongodb-org-tools -y
+    MONGO_VER=8.0 && \
+    curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor && \
+    echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \
+    apt update && \
+    apt install mongodb-database-tools -y
 
 RUN echo -e "\n====> Install Mo" && \
     curl -sSL https://git.io/get-mo -o mo && \
@@ -31,11 +30,11 @@ RUN echo -e "\n====> Install Mo" && \
     mv mo /usr/local/bin/
 
 RUN echo -e "\n====> Install S3" && \
-    apt-get install rclone
+    apt install rclone
 
 RUN echo -e "\n====> Post install tasks" && \
     mkdir -p /srv/backup && \
-    apt-get clean
+    apt clean
 
 COPY assets/ /
 WORKDIR /usr/local/sbin
diff --git a/build-docker.sh b/build-docker.sh
index 61e559f..39c9469 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_BASEIMAGE=ubuntu:20.04
+DOCKER_BASEIMAGE=ubuntu:24.04
 DOCKER_MAINTAINER=vasyakrg@gmail.com
 
 docker buildx create --name cibuilder --driver docker-container --use