diff --git a/docker/Dockerfile b/docker/Dockerfile
index f6984f8b..0a1cf34a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,32 +50,35 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         curl \
         ffmpeg \
-        gnupg2 \
-        gpg \
         libpcre3 \
         libpq-dev \
-        lsb-release \
         nginx \
         procps \
         streamlink \
-        wget && \
+        wget \
+        gnupg2 \
+        lsb-release && \
     cp /app/docker/nginx.conf /etc/nginx/sites-enabled/default && \
+    # Set up PostgreSQL repository using more modern method
     echo "=== setting up postgres ====" && \
-    echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+    sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/postgresql-keyring.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+    # Set up Redis repository
     echo "=== setting up redis ===" && \
     curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg && \
     chmod 644 /usr/share/keyrings/redis-archive-keyring.gpg && \
     echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/redis.list && \
+    # Update and install database packages
     apt-get update && \
     apt-get install -y \
         postgresql-14 \
         postgresql-contrib-14 \
         redis-server && \
-    mkdir /data && \
+    mkdir -p /data && \
+    # Cleanup
     apt-get remove -y \
         gnupg2 \
-        gpg \
         lsb-release && \
     apt-get clean && \
     apt-get autoremove -y && \