diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000..13566b81b0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..d843f340d2
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings" defaultProject="true" />
+</project>
\ No newline at end of file
diff --git a/16/alpine3.21/Dockerfile b/16/alpine3.21/Dockerfile
index 2c90ad3792..3cc5f7a041 100644
--- a/16/alpine3.21/Dockerfile
+++ b/16/alpine3.21/Dockerfile
@@ -53,8 +53,8 @@ ENV LANG en_US.utf8
 RUN mkdir /docker-entrypoint-initdb.d
 
 ENV PG_MAJOR 16
-ENV PG_VERSION 16.6
-ENV PG_SHA256 23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b
+ENV PG_VERSION 16.4
+ENV PG_SHA256 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f
 
 ENV DOCKER_PG_LLVM_DEPS \
 		llvm19-dev \
@@ -71,9 +71,12 @@ RUN set -eux; \
 		--directory /usr/src/postgresql \
 		--strip-components 1 \
 	; \
-	rm postgresql.tar.bz2; \
-	\
-	apk add --no-cache --virtual .build-deps \
+	rm postgresql.tar.bz2;
+
+RUN set -eux; \
+    sed -i 's/ControlFile\.wal_level = WAL_LEVEL_MINIMAL;/ControlFile.wal_level = WAL_LEVEL_REPLICA;/g' /usr/src/postgresql/src/bin/pg_resetwal/pg_resetwal.c
+
+RUN	apk add --no-cache --virtual .build-deps \
 		$DOCKER_PG_LLVM_DEPS \
 		bison \
 		coreutils \
diff --git a/17/alpine3.21/Dockerfile b/17/alpine3.21/Dockerfile
index b8b439b28c..48eb0e1b5c 100644
--- a/17/alpine3.21/Dockerfile
+++ b/17/alpine3.21/Dockerfile
@@ -70,9 +70,12 @@ RUN set -eux; \
 		--directory /usr/src/postgresql \
 		--strip-components 1 \
 	; \
-	rm postgresql.tar.bz2; \
-	\
-	apk add --no-cache --virtual .build-deps \
+	rm postgresql.tar.bz2;
+
+RUN set -eux; \
+    sed -i 's/ControlFile\.wal_level = WAL_LEVEL_MINIMAL;/ControlFile.wal_level = WAL_LEVEL_REPLICA;/g' /usr/src/postgresql/src/bin/pg_resetwal/pg_resetwal.c
+
+RUN apk add --no-cache --virtual .build-deps \
 		$DOCKER_PG_LLVM_DEPS \
 		bison \
 		coreutils \