diff --git a/test/container.yaml b/test/container.yaml
index 242f384e4..50f219151 100644
--- a/test/container.yaml
+++ b/test/container.yaml
@@ -12,16 +12,10 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
-20241002A:
-  x86_64:
-    u22: 57c2af91a1b1a9624e325b704cc9213821c6b968
-
-20240715A:
+20241016A:
   x86_64:
     d11: f3bc523f10e873f85b889120ea08c6c53358cc47
-
-20240612A:
-  x86_64:
-    f40: ae6241a28e5d8a6b6060d0ef00855f519ea45c24
-    rh8: 84e3ece92ebc2650346a9ea783940d33ec2872db
-    u20: a754f9acc98c79a0b0ad3a39a140a752a27ac5e7
+    f40: a59c18a04452fa65845183ab94f6c308be578457
+    rh8: 4d141c845abfbdbf402ba447cf2bd2e4357c8a63
+    u20: 711ee90bf3ea0e8bb054285193811266b9b1f2f3
+    u22: 57c2af91a1b1a9624e325b704cc9213821c6b968
diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm
index 91bbc422b..4826bc5f7 100644
--- a/test/lib/pgBackRestTest/Common/VmTest.pm
+++ b/test/lib/pgBackRestTest/Common/VmTest.pm
@@ -148,11 +148,11 @@ my $oyVm =
 
         &VM_DB =>
         [
-            PG_VERSION_12,
             PG_VERSION_13,
             PG_VERSION_14,
             PG_VERSION_15,
             PG_VERSION_16,
+            PG_VERSION_17,
         ],
 
         &VM_DB_TEST =>
@@ -177,10 +177,11 @@ my $oyVm =
 
         &VM_DB =>
         [
-            PG_VERSION_12,
             PG_VERSION_13,
             PG_VERSION_14,
             PG_VERSION_15,
+            PG_VERSION_16,
+            PG_VERSION_17,
         ],
 
         &VM_DB_TEST =>
@@ -211,6 +212,8 @@ my $oyVm =
             PG_VERSION_13,
             PG_VERSION_14,
             PG_VERSION_15,
+            PG_VERSION_16,
+            PG_VERSION_17,
         ],
 
         &VM_DB_TEST =>