diff --git a/Dockerfile b/Dockerfile
index 6379a17d81ff8edc9a7c434ebe05ef0764ebbc51..3dc9d862fa1eba327ddc0028aa3f8391b302614c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 
-FROM registry.conarx.tech/containers/postgresql/3.20 as tsbuilder-base
+FROM registry.conarx.tech/containers/postgresql/3.21 as tsbuilder-base
 
 ENV POSTGRESQL_VER=17.2
 
@@ -111,7 +111,7 @@ RUN set -eux; \
 
 
 
-FROM registry.conarx.tech/containers/postgresql/3.20
+FROM registry.conarx.tech/containers/postgresql/3.21
 
 
 # NK: Versions are reverse ordered so newer ones overwrite data from older ones
@@ -119,9 +119,9 @@ COPY --from=tsbuilder-2.17.2 /build/timescaledb-root /
 
 
 ARG VERSION_INFO=
-LABEL org.opencontainers.image.authors   "Nigel Kukard <nkukard@conarx.tech>"
-LABEL org.opencontainers.image.version   "3.20"
-LABEL org.opencontainers.image.base.name "registry.conarx.tech/containers/postgresql/3.20"
+LABEL org.opencontainers.image.authors   = "Nigel Kukard <nkukard@conarx.tech>"
+LABEL org.opencontainers.image.version   = "3.21"
+LABEL org.opencontainers.image.base.name = "registry.conarx.tech/containers/postgresql/3.21"
 
 
 RUN set -eux; \
diff --git a/get_release_version b/get_release_version
index 6c00d88fcd8fd9c5b4ba55dc0d65204a307fc92f..d5ac8d4e751672bbeaebfc077d62a6ac33c734e1 100755
--- a/get_release_version
+++ b/get_release_version
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/pre-init-tests.d/44-postgresql-timescaledb.sh b/usr/local/share/flexible-docker-containers/pre-init-tests.d/44-postgresql-timescaledb.sh
index 521ccb670bf8e9f36fc2beda7bf05a37a95eec71..42f2eba9b1333ef613f21192e6b35fea209e0584 100644
--- a/usr/local/share/flexible-docker-containers/pre-init-tests.d/44-postgresql-timescaledb.sh
+++ b/usr/local/share/flexible-docker-containers/pre-init-tests.d/44-postgresql-timescaledb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/usr/local/share/flexible-docker-containers/tests.d/44-postgresql-timescaledb.sh b/usr/local/share/flexible-docker-containers/tests.d/44-postgresql-timescaledb.sh
index 5b29300a4d84ae2dfee4ba0f1ce0352bd08f8952..48f74e6ee247f5d8c696be7744a4afcc6176367d 100644
--- a/usr/local/share/flexible-docker-containers/tests.d/44-postgresql-timescaledb.sh
+++ b/usr/local/share/flexible-docker-containers/tests.d/44-postgresql-timescaledb.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2023, AllWorldIT.
+# Copyright (c) 2022-2025, AllWorldIT.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to