diff --git a/16/Dockerfile b/16/Dockerfile
index a9c89ee..f45cf2f 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,5 +1,5 @@
 # TimescaleDB
-FROM docker.io/timescale/timescaledb:2.17.2-pg16-bitnami AS timescaledb
+FROM docker.io/timescale/timescaledb:2.17.2-pg17-oss AS timescaledb
 
 # Select and copy the last 3 versions of the extension
 RUN mkdir -p /tmp/lib /tmp/share /tmp/bin \
@@ -16,7 +16,7 @@ RUN mkdir -p /tmp/lib /tmp/share /tmp/bin \
 RUN echo -e "[INFO] TimescaleDB lib files to be installed: \n$(ls /tmp/lib)"
 
 # PostgreSQL Server
-FROM docker.io/bitnami/postgresql:16.4.0 AS postgresql
+FROM docker.io/bitnami/postgresql:16.5.0 AS postgresql
 
 # TimescaleDB tools
 COPY --from=timescaledb /tmp/bin/* /usr/local/bin/
diff --git a/17/Dockerfile b/17/Dockerfile
index eba8af7..cd6d4b6 100644
--- a/17/Dockerfile
+++ b/17/Dockerfile
@@ -1,5 +1,5 @@
 # TimescaleDB
-FROM docker.io/timescale/timescaledb:2.17.2-pg17-bitnami AS timescaledb
+FROM docker.io/timescale/timescaledb:2.17.2-pg17-oss AS timescaledb
 
 # Select and copy the last 3 versions of the extension
 RUN mkdir -p /tmp/lib /tmp/share /tmp/bin \
@@ -16,7 +16,7 @@ RUN mkdir -p /tmp/lib /tmp/share /tmp/bin \
 RUN echo -e "[INFO] TimescaleDB lib files to be installed: \n$(ls /tmp/lib)"
 
 # PostgreSQL Server
-FROM docker.io/bitnami/postgresql:17.0.0 AS postgresql
+FROM docker.io/bitnami/postgresql:17.1.0 AS postgresql
 
 # TimescaleDB tools
 COPY --from=timescaledb /tmp/bin/* /usr/local/bin/