diff --git a/.github/workflows/release-pgpool.yml b/.github/workflows/release-pgpool.yml
index 5bd37e4..8e93f8e 100644
--- a/.github/workflows/release-pgpool.yml
+++ b/.github/workflows/release-pgpool.yml
@@ -4,10 +4,10 @@ on:
   schedule:
     - cron: '19 3 * * *'
   push:
-    branches: [ main, 15-3.3, 17-3.5 ]
+    branches: [ main, 15-3.3, 18-3.6 ]
 
 env:
-  LATEST: '17-3.5'
+  LATEST: '18-3.6'
   REGISTRY: docker.io
   IMAGE_NAME: ${{ github.repository }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ad277b..c4e7fda 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,10 +4,10 @@ on:
   schedule:
     - cron: '19 3 * * *'
   push:
-    branches: [ main, 15-3.3, 17-3.5 ]
+    branches: [ main, 15-3.3, 18-3.6 ]
 
 env:
-  LATEST: '17-3.5'
+  LATEST: '18-3.6'
   REGISTRY: docker.io
   IMAGE_NAME: ${{ github.repository }}
 
diff --git a/Dockerfile b/Dockerfile
index 2180e62..26b71d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM postgres:17-bullseye
+FROM postgres:18-trixie
 
 LABEL maintainer="HIPAA Postgres w/ PostGIS Project" \
-      org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension with PostgreSQL 17 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-1.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
       org.opencontainers.image.source="https://github.com/netreconlab/hipaa-postgres/"
 
 ENV POSTGIS_MAJOR=3
-ENV POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION=3.6.0+dfsg-1.pgdg13+1
 ENV POSTGRES_INITDB_ARGS="--data-checksums"
 
 RUN apt-get update \
diff --git a/Dockerfile.pgpool b/Dockerfile.pgpool
index 0b9340d..5cdd764 100644
--- a/Dockerfile.pgpool
+++ b/Dockerfile.pgpool
@@ -1,11 +1,11 @@
-FROM postgres:17-bullseye
+FROM postgres:18-trixie
 
 LABEL maintainer="HIPAA Postgres w/ PostGIS Project" \
-      org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension and PGPool with PostgreSQL 17 bullseye" \
+      org.opencontainers.image.description="PostGIS 3.5.2+dfsg-1.pgdg110+1 spatial database extension and PGPool with PostgreSQL 18 trixie" \
       org.opencontainers.image.source="https://github.com/netreconlab/hipaa-postgres/"
 
 ENV POSTGIS_MAJOR=3
-ENV POSTGIS_VERSION=3.5.2+dfsg-1.pgdg110+1
+ENV POSTGIS_VERSION=3.6.0+dfsg-1.pgdg13+1
 ENV POSTGRES_INITDB_ARGS="--data-checksums"
 
 RUN apt-get update \