diff --git a/collector/Dockerfile b/collector/Dockerfile
index a0e8f14..47a607d 100644
--- a/collector/Dockerfile
+++ b/collector/Dockerfile
@@ -19,8 +19,8 @@
 #   Example docker build:
 #     tar -c -C ../../ ./obmp-collector ./obmp-docker/collector \
 #           | docker buildx build --progress=plain \
-#                 --build-arg VERSION=2.1.0 \
-#                 -f obmp-docker/collector/Dockerfile -t openbmp/collector:2.1.0 -
+#                 --build-arg VERSION=2.1.1 \
+#                 -f obmp-docker/collector/Dockerfile -t openbmp/collector:2.1.1 -
 #
 
 # -----------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 0cd5f9c..10b6398 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,12 +64,17 @@ services:
     restart: unless-stopped
     container_name: obmp-psql
     image: openbmp/postgres:2.1.0
-    shm_size: 1024m
+    shm_size: 1536m
+    sysctls:
+      - net.ipv4.tcp_keepalive_intvl=30
+      - net.ipv4.tcp_keepalive_probes=5
+      - net.ipv4.tcp_keepalive_time=180
     ports:
       - "5432:5432"
     volumes:
       - ${OBMP_DATA_ROOT}/postgres/data:/var/lib/postgresql/data  # change this to 80GB SSD slice/partition
       - ${OBMP_DATA_ROOT}/postgres/ts:/var/lib/postgresql/ts      # Chnage this to 500GB SSD slice/partition
+    # alter_job max_runtime in _timescaledb_config.bgw_job ( https://docs.timescale.com/latest/api#alter_job )
     command: >
       -c max_wal_size=10GB
     environment:
@@ -80,7 +85,7 @@ services:
   collector:
     restart: unless-stopped
     container_name: obmp-collector
-    image: openbmp/collector:2.1.0
+    image: openbmp/collector:2.1.1
     sysctls:
       - net.ipv4.tcp_keepalive_intvl=30
       - net.ipv4.tcp_keepalive_probes=5
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index feba77a..2c38e9c 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -3,7 +3,7 @@
 #  Copyright (c) 2021-2022 Cisco Systems, Inc. and others.  All rights reserved.
 #
 #  Build:
-#        DOCKER_BUILDKIT=1 docker build --platform linux/amd64 -t openbmp/postgres:2.1.0 .
+#        DOCKER_BUILDKIT=1 docker build --platform linux/amd64 -t openbmp/postgres:2.1.1 .
 #
 #  Run:
 #       docker run --rm -it -p 5432:5432 \
@@ -15,7 +15,7 @@
 # -----------------------------------------------
 # stage: Build
 # -----------------------------------------------
-FROM timescale/timescaledb:2.5.1-pg14 AS build
+FROM timescale/timescaledb:2.6.0-pg14 AS build
 
 ENV PG_CRON_VERSION 1.3.0
 
@@ -35,7 +35,7 @@ RUN wget -O pg_cron.tgz https://github.com/citusdata/pg_cron/archive/v$PG_CRON_V
 # stage: Final container
 # -----------------------------------------------
 
-FROM timescale/timescaledb:2.5.1-pg14
+FROM timescale/timescaledb:2.6.0-pg14
 
 ENV PG_CRON_VERSION 1.3.0
 
diff --git a/postgres/README.md b/postgres/README.md
index dbae4fc..5fc1cbe 100644
--- a/postgres/README.md
+++ b/postgres/README.md
@@ -12,7 +12,7 @@ docker run --rm -it -p 5432:5432 \
     -e POSTGRES_PASSWORD=openbmp \
     -e POSTGRES_USER=openbmp \
     -e POSTGRES_DB=openbmp \
-    openbmp/postgres:build-NNN
+    openbmp/postgres:<version>
 ```
 
 ### Configuration/Environment Variables