diff --git a/12-3.3/alpine3.21/Dockerfile b/12-3.3/alpine3.21/Dockerfile
index 0499b7ab..849f6203 100644
--- a/12-3.3/alpine3.21/Dockerfile
+++ b/12-3.3/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/12-3.4/alpine3.20/Dockerfile b/12-3.4/alpine3.20/Dockerfile
index 15d38950..b6c4801d 100644
--- a/12-3.4/alpine3.20/Dockerfile
+++ b/12-3.4/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/12-3.4/alpine3.21/Dockerfile b/12-3.4/alpine3.21/Dockerfile
index 59f5b16e..4ba56642 100644
--- a/12-3.4/alpine3.21/Dockerfile
+++ b/12-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/12-3.5/alpine3.20/Dockerfile b/12-3.5/alpine3.20/Dockerfile
index 3225ae1e..541d606e 100644
--- a/12-3.5/alpine3.20/Dockerfile
+++ b/12-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/12-3.5/alpine3.21/Dockerfile b/12-3.5/alpine3.21/Dockerfile
index dd152e67..b1799247 100644
--- a/12-3.5/alpine3.21/Dockerfile
+++ b/12-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/12-3.5/bookworm/Dockerfile b/12-3.5/bookworm/Dockerfile
index 8788d94a..845befbc 100644
--- a/12-3.5/bookworm/Dockerfile
+++ b/12-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:12-bookworm
diff --git a/12-3.5/bullseye/Dockerfile b/12-3.5/bullseye/Dockerfile
index f8499e23..6859686e 100644
--- a/12-3.5/bullseye/Dockerfile
+++ b/12-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:12-bullseye
diff --git a/13-3.3/alpine3.21/Dockerfile b/13-3.3/alpine3.21/Dockerfile
index d91c64ae..7c54f967 100644
--- a/13-3.3/alpine3.21/Dockerfile
+++ b/13-3.3/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/13-3.4/alpine3.20/Dockerfile b/13-3.4/alpine3.20/Dockerfile
index 73f33fb5..bde1f353 100644
--- a/13-3.4/alpine3.20/Dockerfile
+++ b/13-3.4/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/13-3.4/alpine3.21/Dockerfile b/13-3.4/alpine3.21/Dockerfile
index df650a37..26afb952 100644
--- a/13-3.4/alpine3.21/Dockerfile
+++ b/13-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/13-3.5/alpine3.20/Dockerfile b/13-3.5/alpine3.20/Dockerfile
index bb63d8ab..2fa0b2fe 100644
--- a/13-3.5/alpine3.20/Dockerfile
+++ b/13-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/13-3.5/alpine3.21/Dockerfile b/13-3.5/alpine3.21/Dockerfile
index 85213144..96849bc1 100644
--- a/13-3.5/alpine3.21/Dockerfile
+++ b/13-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/13-3.5/bookworm/Dockerfile b/13-3.5/bookworm/Dockerfile
index 2af2aa46..42360957 100644
--- a/13-3.5/bookworm/Dockerfile
+++ b/13-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:13-bookworm
diff --git a/13-3.5/bullseye/Dockerfile b/13-3.5/bullseye/Dockerfile
index cf4010cd..ea7f3562 100644
--- a/13-3.5/bullseye/Dockerfile
+++ b/13-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:13-bullseye
diff --git a/14-3.3/alpine3.21/Dockerfile b/14-3.3/alpine3.21/Dockerfile
index face26a3..6b79d55d 100644
--- a/14-3.3/alpine3.21/Dockerfile
+++ b/14-3.3/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/14-3.4/alpine3.20/Dockerfile b/14-3.4/alpine3.20/Dockerfile
index 4bb0daa6..6a25334a 100644
--- a/14-3.4/alpine3.20/Dockerfile
+++ b/14-3.4/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/14-3.4/alpine3.21/Dockerfile b/14-3.4/alpine3.21/Dockerfile
index c3b2a74d..569e89e4 100644
--- a/14-3.4/alpine3.21/Dockerfile
+++ b/14-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/14-3.5/alpine3.20/Dockerfile b/14-3.5/alpine3.20/Dockerfile
index 3d984641..00d3da56 100644
--- a/14-3.5/alpine3.20/Dockerfile
+++ b/14-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/14-3.5/alpine3.21/Dockerfile b/14-3.5/alpine3.21/Dockerfile
index b2f36d1c..4b872202 100644
--- a/14-3.5/alpine3.21/Dockerfile
+++ b/14-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/14-3.5/bookworm/Dockerfile b/14-3.5/bookworm/Dockerfile
index e17be52c..be07f481 100644
--- a/14-3.5/bookworm/Dockerfile
+++ b/14-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:14-bookworm
diff --git a/14-3.5/bullseye/Dockerfile b/14-3.5/bullseye/Dockerfile
index 753171c8..adf40961 100644
--- a/14-3.5/bullseye/Dockerfile
+++ b/14-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:14-bullseye
diff --git a/14-l3.1.9gcp/bookworm/Dockerfile b/14-l3.1.9gcp/bookworm/Dockerfile
index 46b4663a..1087526b 100644
--- a/14-l3.1.9gcp/bookworm/Dockerfile
+++ b/14-l3.1.9gcp/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.master.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.master.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 # "Experimental"; solely for testing purposes. Anticipate frequent changes!
diff --git a/15-3.3/alpine3.21/Dockerfile b/15-3.3/alpine3.21/Dockerfile
index 33e21c47..cd64311c 100644
--- a/15-3.3/alpine3.21/Dockerfile
+++ b/15-3.3/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/15-3.4/alpine3.20/Dockerfile b/15-3.4/alpine3.20/Dockerfile
index acf8d09e..a624e43b 100644
--- a/15-3.4/alpine3.20/Dockerfile
+++ b/15-3.4/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/15-3.4/alpine3.21/Dockerfile b/15-3.4/alpine3.21/Dockerfile
index 259ee0d1..28758e2c 100644
--- a/15-3.4/alpine3.21/Dockerfile
+++ b/15-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/15-3.5/alpine3.20/Dockerfile b/15-3.5/alpine3.20/Dockerfile
index e07909e9..3c367d66 100644
--- a/15-3.5/alpine3.20/Dockerfile
+++ b/15-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/15-3.5/alpine3.21/Dockerfile b/15-3.5/alpine3.21/Dockerfile
index 283fc2ca..fcec61ae 100644
--- a/15-3.5/alpine3.21/Dockerfile
+++ b/15-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/15-3.5/bookworm/Dockerfile b/15-3.5/bookworm/Dockerfile
index aaf727d1..59c4a3fc 100644
--- a/15-3.5/bookworm/Dockerfile
+++ b/15-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:15-bookworm
diff --git a/15-3.5/bullseye/Dockerfile b/15-3.5/bullseye/Dockerfile
index 2f62defd..eac8b319 100644
--- a/15-3.5/bullseye/Dockerfile
+++ b/15-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:15-bullseye
diff --git a/16-3.3/alpine3.21/Dockerfile b/16-3.3/alpine3.21/Dockerfile
index 8ee69639..886eeb4b 100644
--- a/16-3.3/alpine3.21/Dockerfile
+++ b/16-3.3/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/16-3.4/alpine3.20/Dockerfile b/16-3.4/alpine3.20/Dockerfile
index da2cc7d7..6df0c52d 100644
--- a/16-3.4/alpine3.20/Dockerfile
+++ b/16-3.4/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/16-3.4/alpine3.21/Dockerfile b/16-3.4/alpine3.21/Dockerfile
index 8e960c52..fcc8c09c 100644
--- a/16-3.4/alpine3.21/Dockerfile
+++ b/16-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/16-3.5-bundle0/bookworm/Dockerfile b/16-3.5-bundle0/bookworm/Dockerfile
index ebc1ac4f..8343bdf8 100644
--- a/16-3.5-bundle0/bookworm/Dockerfile
+++ b/16-3.5-bundle0/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.bundle0.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.bundle0.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
@@ -12,9 +12,9 @@
 
 # set the base image ,  make build-* is overwriting with the actual value !
 
-ARG REGISTRY=docker.io
-ARG REPO_NAME=imresamu
-ARG IMAGE_NAME=postgis-amd64
+ARG REGISTRY=localhost:5000
+ARG REPO_NAME=testrepo
+ARG IMAGE_NAME=testpostgisimage-amd64
 
 ARG PGIS1_BASE_IMAGE=${REGISTRY}/${REPO_NAME}/${IMAGE_NAME}:16-3.5-bookworm
 
diff --git a/16-3.5/alpine3.20/Dockerfile b/16-3.5/alpine3.20/Dockerfile
index 21e3f9b5..bc071b3f 100644
--- a/16-3.5/alpine3.20/Dockerfile
+++ b/16-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/16-3.5/alpine3.21/Dockerfile b/16-3.5/alpine3.21/Dockerfile
index 13f6a0cc..27adad41 100644
--- a/16-3.5/alpine3.21/Dockerfile
+++ b/16-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/16-3.5/bookworm/Dockerfile b/16-3.5/bookworm/Dockerfile
index a5d1e2e9..eb8bb2e2 100644
--- a/16-3.5/bookworm/Dockerfile
+++ b/16-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:16-bookworm
diff --git a/16-3.5/bullseye/Dockerfile b/16-3.5/bullseye/Dockerfile
index a0d149ad..3ddf2cf7 100644
--- a/16-3.5/bullseye/Dockerfile
+++ b/16-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:16-bullseye
diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile
index 57973a8b..36f6f855 100644
--- a/16-master/bookworm/Dockerfile
+++ b/16-master/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.master.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.master.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 # "Experimental"; solely for testing purposes. Anticipate frequent changes!
diff --git a/16-recent/bookworm/Dockerfile b/16-recent/bookworm/Dockerfile
index 35c2aa01..30a0719e 100644
--- a/16-recent/bookworm/Dockerfile
+++ b/16-recent/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.master.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.master.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 # "Experimental"; solely for testing purposes. Anticipate frequent changes!
diff --git a/17-3.4/alpine3.21/Dockerfile b/17-3.4/alpine3.21/Dockerfile
index 3a26e42d..91450f7a 100644
--- a/17-3.4/alpine3.21/Dockerfile
+++ b/17-3.4/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/17-3.5/alpine3.20/Dockerfile b/17-3.5/alpine3.20/Dockerfile
index 36798eb4..0c5c9b10 100644
--- a/17-3.5/alpine3.20/Dockerfile
+++ b/17-3.5/alpine3.20/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/17-3.5/alpine3.21/Dockerfile b/17-3.5/alpine3.21/Dockerfile
index fe07105d..d98a346f 100644
--- a/17-3.5/alpine3.21/Dockerfile
+++ b/17-3.5/alpine3.21/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.alpine.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.alpine.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/17-3.5/bookworm/Dockerfile b/17-3.5/bookworm/Dockerfile
index 60888dec..36628f0c 100644
--- a/17-3.5/bookworm/Dockerfile
+++ b/17-3.5/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:17-bookworm
diff --git a/17-3.5/bullseye/Dockerfile b/17-3.5/bullseye/Dockerfile
index be609556..0af2f3f8 100644
--- a/17-3.5/bullseye/Dockerfile
+++ b/17-3.5/bullseye/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.debian.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.debian.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 FROM postgres:17-bullseye
diff --git a/17-master/bookworm/Dockerfile b/17-master/bookworm/Dockerfile
index 030daa58..4a35dc69 100644
--- a/17-master/bookworm/Dockerfile
+++ b/17-master/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.master.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.master.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 # "Experimental"; solely for testing purposes. Anticipate frequent changes!
diff --git a/17-recent/bookworm/Dockerfile b/17-recent/bookworm/Dockerfile
index d7c15bc6..dcef8bf9 100644
--- a/17-recent/bookworm/Dockerfile
+++ b/17-recent/bookworm/Dockerfile
@@ -1,6 +1,6 @@
 #
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#       source: "Dockerfile.master.template"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
+#       source: "./templates/Dockerfile.master.template"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 # "Experimental"; solely for testing purposes. Anticipate frequent changes!
diff --git a/README.md b/README.md
index 10053e49..15cd4a56 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ This image ensures that the default database created by the parent `postgres` im
 Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
 
 
-## Versions (2025-01-04)
+## Versions (2025-01-05)
 
 
 We provide multi-platform image support for the following architectures:
@@ -69,14 +69,14 @@ For those new to PostGIS, we recommend the following image versions:
 - This version is easy to extend and has matured over time.
 
 <!-- bookworm_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.1 |
-| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.1 |
-| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.1 |
-| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.1 |
-| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 |
-| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.1 |
+| [`12-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5-bookworm), [`12-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5.1-bookworm), [`12-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.5.1 |
+| [`13-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-bookworm), [`13-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5.1-bookworm), [`13-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.5.1 |
+| [`14-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-bookworm), [`14-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5.1-bookworm), [`14-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.5.1 |
+| [`15-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-bookworm), [`15-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5.1-bookworm), [`15-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.5.1 |
+| [`16-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-bookworm), [`16-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.1-bookworm), [`16-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 |
+| [`17-3.5-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-bookworm), [`17-3.5.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5.1-bookworm), [`17-3.5`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5), [`latest`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | 3.5.1 |
 <!-- bookworm_end  -->
 
 ### 📘Debian - bullseye
@@ -86,14 +86,14 @@ For those new to PostGIS, we recommend the following image versions:
 - This version is easy to extend and has matured over time.
 
 <!-- bullseye_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.1 |
-| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.1 |
-| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.1 |
-| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.1 |
-| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.1 |
-| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.1-bullseye`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-bullseye) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.1 |
+| [`12-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5-bullseye), [`12-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 12 | 3.5.1 |
+| [`13-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-bullseye), [`13-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 13 | 3.5.1 |
+| [`14-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-bullseye), [`14-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 14 | 3.5.1 |
+| [`15-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-bullseye), [`15-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 15 | 3.5.1 |
+| [`16-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-bullseye), [`16-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 16 | 3.5.1 |
+| [`17-3.5-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-bullseye), [`17-3.5.1-bullseye`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5.1-bullseye) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/bullseye/Dockerfile) | amd64 arm64 | bullseye | 17 | 3.5.1 |
 <!-- bullseye_end  -->
 
 
@@ -104,10 +104,10 @@ For those new to PostGIS, we recommend the following image versions:
 * The specific versions of the libraries used (like postgis, geos, proj, gdal, cgal, sfcgal) can be found in the tags of the image or in the Dockerfile.
 
 <!-- recent_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`16-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 |
-| [`17-recent-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 |
+| [`16-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent-bookworm), [`16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`16-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 |
+| [`17-recent-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-recent-bookworm), [`17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-recent-postgis3.5.1-geos3.13.0-proj9.5.1-gdal3.10.0-cgal6.0.1-sfcgal2.0.0-bookworm), [`17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-recent-postgis3.5-geos3.13-proj9.5-gdal3.10-cgal6.0-sfcgal2.0-bookworm), [`17-recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-recent), [`recent`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=recent) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-recent/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | postgis=tags/3.5.1, geos=tags/3.13.0, proj=tags/9.5.1, gdal=tags/v3.10.0, cgal=tags/v6.0.1, sfcgal=tags/v2.0.0 |
 <!-- recent_end  -->
 
 ### 🧪Debian Geo Bundle ( experimental )
@@ -118,9 +118,9 @@ Please note that the included package list is subject to change as we continue t
 
 
 <!-- bundle0_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.1-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 |
+| [`16-3.5-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-bundle0-bookworm), [`16-3.5.1-bundle0-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.1-bundle0-bookworm), [`16-3.5-bundle0`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-bundle0) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.5.1 |
 <!-- bundle0_end  -->
 
 
@@ -131,25 +131,25 @@ Please note that the included package list is subject to change as we continue t
 - PostGIS is compiled from source, making it a bit more challenging to extend.
 
 <!-- alpine3.21_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`12-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine3.21), [`12-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3.8-alpine3.21), [`12-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.3.8 |
-| [`12-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.21), [`12-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.21), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.4.4 |
-| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.1 |
-| [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 |
-| [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 |
-| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.1 |
-| [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 |
-| [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 |
-| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.1 |
-| [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 |
-| [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 |
-| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.1 |
-| [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 |
-| [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 |
-| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.1 |
-| [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 |
-| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.1 |
+| [`12-3.3-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.3-alpine3.21), [`12-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.3.8-alpine3.21), [`12-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.3.8 |
+| [`12-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine3.21), [`12-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.4-alpine3.21), [`12-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.4.4 |
+| [`12-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5-alpine3.21), [`12-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5.1-alpine3.21), [`12-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 12 | 3.5.1 |
+| [`13-3.3-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.3-alpine3.21), [`13-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.3.8-alpine3.21), [`13-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.3.8 |
+| [`13-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine3.21), [`13-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.4-alpine3.21), [`13-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.4.4 |
+| [`13-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-alpine3.21), [`13-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5.1-alpine3.21), [`13-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 13 | 3.5.1 |
+| [`14-3.3-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.3-alpine3.21), [`14-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.3.8-alpine3.21), [`14-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.3.8 |
+| [`14-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine3.21), [`14-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.4-alpine3.21), [`14-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.4.4 |
+| [`14-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-alpine3.21), [`14-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5.1-alpine3.21), [`14-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 14 | 3.5.1 |
+| [`15-3.3-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.3-alpine3.21), [`15-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.3.8-alpine3.21), [`15-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.3.8 |
+| [`15-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine3.21), [`15-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.4-alpine3.21), [`15-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.4.4 |
+| [`15-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-alpine3.21), [`15-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5.1-alpine3.21), [`15-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 15 | 3.5.1 |
+| [`16-3.3-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.3-alpine3.21), [`16-3.3.8-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.3.8-alpine3.21), [`16-3.3-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.3-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.3/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.3.8 |
+| [`16-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine3.21), [`16-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.4-alpine3.21), [`16-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.4.4 |
+| [`16-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine3.21), [`16-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.1-alpine3.21), [`16-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 16 | 3.5.1 |
+| [`17-3.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.4-alpine3.21), [`17-3.4.4-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.4.4-alpine3.21), [`17-3.4-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.4-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.4/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.4.4 |
+| [`17-3.5-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine3.21), [`17-3.5.1-alpine3.21`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5.1-alpine3.21), [`17-3.5-alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine), [`alpine`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine3.21/Dockerfile) | amd64 arm64 | alpine3.21 | 17 | 3.5.1 |
 <!-- alpine3.21_end  -->
 
 ### ⛰️Alpine 3.20 based
@@ -159,19 +159,19 @@ Please note that the included package list is subject to change as we continue t
 - PostGIS is compiled from source, making it a bit more challenging to extend.
 
 <!-- alpine3.20_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 |
-| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 |
-| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 |
-| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 |
-| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 |
-| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 |
-| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 |
-| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 |
-| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 |
-| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 |
-| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-3.5.1-alpine3.20) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 |
+| [`12-3.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4-alpine3.20), [`12-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.4.4-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.4.4 |
+| [`12-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5-alpine3.20), [`12-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=12-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/12-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 12 | 3.5.1 |
+| [`13-3.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4-alpine3.20), [`13-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.4.4-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.4.4 |
+| [`13-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-alpine3.20), [`13-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 13 | 3.5.1 |
+| [`14-3.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4-alpine3.20), [`14-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.4.4-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.4.4 |
+| [`14-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-alpine3.20), [`14-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 14 | 3.5.1 |
+| [`15-3.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4-alpine3.20), [`15-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.4.4-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.4.4 |
+| [`15-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-alpine3.20), [`15-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 15 | 3.5.1 |
+| [`16-3.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4-alpine3.20), [`16-3.4.4-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.4.4-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.4/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.4.4 |
+| [`16-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine3.20), [`16-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 16 | 3.5.1 |
+| [`17-3.5-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine3.20), [`17-3.5.1-alpine3.20`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5.1-alpine3.20) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine3.20/Dockerfile) | amd64 arm64 | alpine3.20 | 17 | 3.5.1 |
 <!-- alpine3.20_end  -->
 
 
@@ -181,9 +181,9 @@ Please note that the included package list is subject to change as we continue t
 * Definition in the [./locked.yml](locked.yml) 
    * and the image identifiers : <pg_version>-l<any_unique_postgis_id>
 <!-- locked_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | postgis=tags/3.1.9, geos=tags/3.6.6, proj=tags/6.3.1, gdal=tags/v3.6.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 |
+| [`14-l3.1.9gcp-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-l3.1.9gcp-bookworm), [`14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-l3.1.9gcp-postgis3.1.9-geos3.6.6-proj6.3.1-bookworm) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-l3.1.9gcp/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | postgis=tags/3.1.9, geos=tags/3.6.6, proj=tags/6.3.1, gdal=tags/v3.6.4, cgal=tags/v5.6, sfcgal=tags/v1.5.1 |
 <!-- locked_end  -->
 
 ### 📋Test images
@@ -193,10 +193,10 @@ Please note that the included package list is subject to change as we continue t
 - The ~master SFCGAL version is 1.5 or higher. The cgal version is locked on the [5.6.x-branch](https://github.com/CGAL/cgal/tree/5.6.x-branch).
 
 <!-- test_begin  -->
-| `docker.io/imresamu/postgis:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
+| `localhost:5000/testrepo/testpostgisimage:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
-| [`16-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal |
-| [`17-master-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master-bookworm), [`17-master`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/17-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | development: postgis, geos, proj, gdal, cgal, sfcgal |
+| [`16-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master-bookworm), [`16-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | development: postgis, geos, proj, gdal, cgal, sfcgal |
+| [`17-master-bookworm`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-master-bookworm), [`17-master`](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-master) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-master/bookworm/Dockerfile) | amd64 arm64 | bookworm | 17 | development: postgis, geos, proj, gdal, cgal, sfcgal |
 <!-- test_end  -->
 
 ## 🚀Usage
diff --git a/Dockerfile.alpine.template b/templates/Dockerfile.alpine.template
similarity index 100%
rename from Dockerfile.alpine.template
rename to templates/Dockerfile.alpine.template
diff --git a/Dockerfile.bundle0.template b/templates/Dockerfile.bundle0.template
similarity index 100%
rename from Dockerfile.bundle0.template
rename to templates/Dockerfile.bundle0.template
diff --git a/Dockerfile.debian.template b/templates/Dockerfile.debian.template
similarity index 100%
rename from Dockerfile.debian.template
rename to templates/Dockerfile.debian.template
diff --git a/Dockerfile.master.template b/templates/Dockerfile.master.template
similarity index 100%
rename from Dockerfile.master.template
rename to templates/Dockerfile.master.template
diff --git a/initdb-bundle0.sh b/templates/initdb-bundle0.sh
similarity index 100%
rename from initdb-bundle0.sh
rename to templates/initdb-bundle0.sh
diff --git a/initdb-postgis.sh b/templates/initdb-postgis.sh
similarity index 100%
rename from initdb-postgis.sh
rename to templates/initdb-postgis.sh
diff --git a/update-postgis.sh b/templates/update-postgis.sh
similarity index 100%
rename from update-postgis.sh
rename to templates/update-postgis.sh
diff --git a/_migrate.sh b/tools/_migrate.sh
similarity index 100%
rename from _migrate.sh
rename to tools/_migrate.sh
diff --git a/apply-ci.sh b/tools/apply-ci.sh
similarity index 100%
rename from apply-ci.sh
rename to tools/apply-ci.sh
diff --git a/apply-manifest.sh b/tools/apply-manifest.sh
similarity index 88%
rename from apply-manifest.sh
rename to tools/apply-manifest.sh
index f2dda947..fea0181b 100755
--- a/apply-manifest.sh
+++ b/tools/apply-manifest.sh
@@ -5,20 +5,21 @@ source tools/environment_init.sh
 
 [ -f ./versions.json ]
 input_file="versions.json"
-rm -f manifest.sh
+rm -f ./tools/manifest.sh
 
-cat <<'EOF' >manifest.sh
+cat <<'EOF' > ./tools/manifest.sh
 #!/usr/bin/env bash
 set -Eeuo pipefail
 # Source environment variables and necessary configurations
 source tools/environment_init.sh
+[ -f ./versions.json ]
 
 #
 # Updating the docker manifest for the postgis image.
 # This script uses the version.json metadata file as input to create the updated manifest.
 #   manifest-tool doc : https://github.com/estesp/manifest-tool
 #
-# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh"
+# NOTE: THIS FILE IS GENERATED VIA "./tools/apply-manifest.sh"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 EOF
@@ -74,11 +75,11 @@ for version in $versions; do
             echo ""
             echo "# ----- ${version}-${variant} -----"
             create_manifest "$tags" "$arch"
-        ) >>manifest.sh
+        ) >> ./tools/manifest.sh
 
     done
 done
 
-echo "Done! a new ./manifest.sh has been created!"
-chmod +x ./manifest.sh
-head -n 50 <./manifest.sh
+echo "Done! a new ./tools/manifest.sh has been created!"
+chmod +x ./tools/manifest.sh
+head -n 50 <./tools/manifest.sh
diff --git a/apply-readme.sh b/tools/apply-readme.sh
similarity index 100%
rename from apply-readme.sh
rename to tools/apply-readme.sh
diff --git a/apply-templates.sh b/tools/apply-templates.sh
similarity index 85%
rename from apply-templates.sh
rename to tools/apply-templates.sh
index 857346b7..f8dbcfed 100755
--- a/apply-templates.sh
+++ b/tools/apply-templates.sh
@@ -11,7 +11,6 @@ source tools/environment_init.sh
 # Check dependencies
 [ -f ./versions.json ]
 
-cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 jqt='.jq-template.awk'
 if [ -n "${BASHBREW_SCRIPTS:-}" ]; then
     jqt="$BASHBREW_SCRIPTS/jq-template.awk"
@@ -37,7 +36,7 @@ echo "versions = $versions"
 generated_warning() {
     cat <<-EOH
 		#
-		# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+		# NOTE: THIS DOCKERFILE IS GENERATED VIA "./tools/apply-templates.sh"
 		#       source: "$1"
 		# PLEASE DO NOT EDIT IT DIRECTLY.
 		#
@@ -57,10 +56,10 @@ for version; do
         dir="$version/$variant"
         echo "processing $dir ..."
 
-        template="$(jq -r '.[env.version][env.variant].template' versions.json)"
+        template=./templates/"$(jq -r '.[env.version][env.variant].template' versions.json)"
         echo "  template=$template"
 
-        initfile="$(jq -r '.[env.version][env.variant].initfile' versions.json)"
+        initfile=./templates/"$(jq -r '.[env.version][env.variant].initfile' versions.json)"
         echo "  initfile=$initfile"
 
         tags="$(jq -r '.[env.version][env.variant].tags' versions.json)"
@@ -68,7 +67,7 @@ for version; do
 
         cp -a "$initfile" "$dir/"
         if [ -z "$bundleType" ]; then
-            cp -a update-postgis.sh "$dir/"
+            cp -a ./templates/update-postgis.sh "$dir/"
         fi
 
         echo "$tags" >"$dir/tags"
@@ -82,5 +81,5 @@ for version; do
 done
 
 echo " "
-echo " apply-template : done"
+echo " ./tools/apply-template : done"
 echo " "
diff --git a/localtest.sh b/tools/localtest.sh
similarity index 98%
rename from localtest.sh
rename to tools/localtest.sh
index f478cff5..d3beae31 100755
--- a/localtest.sh
+++ b/tools/localtest.sh
@@ -5,6 +5,7 @@ set -Eeuo pipefail
 export TEST=true
 # Source environment variables and necessary configurations
 source tools/environment_init.sh
+[ -f ./versions.json ]
 
 # Check if the container with name "registry" is already running
 # https://docs.docker.com/registry/deploying/
diff --git a/manifest.sh b/tools/manifest.sh
similarity index 99%
rename from manifest.sh
rename to tools/manifest.sh
index f27c990a..c760dce0 100755
--- a/manifest.sh
+++ b/tools/manifest.sh
@@ -2,13 +2,14 @@
 set -Eeuo pipefail
 # Source environment variables and necessary configurations
 source tools/environment_init.sh
+[ -f ./versions.json ]
 
 #
 # Updating the docker manifest for the postgis image.
 # This script uses the version.json metadata file as input to create the updated manifest.
 #   manifest-tool doc : https://github.com/estesp/manifest-tool
 #
-# NOTE: THIS FILE IS GENERATED VIA "./apply-manifest.sh"
+# NOTE: THIS FILE IS GENERATED VIA "./tools/apply-manifest.sh"
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
diff --git a/versions.sh b/tools/versions.sh
similarity index 99%
rename from versions.sh
rename to tools/versions.sh
index 59dae52a..127d4a4e 100755
--- a/versions.sh
+++ b/tools/versions.sh
@@ -4,6 +4,7 @@ set -Eeuo pipefail
 
 # Source environment variables and necessary configurations
 source tools/environment_init.sh
+[ -f ./versions.json ]
 
 # This code derived from:
 #   - URL: https://github.com/docker-library/postgres/blob/master/versions.sh
@@ -377,7 +378,7 @@ for variant in ${postgis_versions}; do
     echo "postgisSrcSha1[$variant]=${postgisSrcSha1[$variant]}"
 done
 
-cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+#cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 versions=("$@")
 if [ ${#versions[@]} -eq 0 ]; then
     versions=()
@@ -410,7 +411,7 @@ for version in "${versions[@]}"; do
     IFS=- read -r postgresVersion postgisVersion bundleType <<<"$version"
 
     echo " "
-    echo "---- generate Dockerfile for $version ----"
+    echo "---- generate metadata for $version ----"
     echo "postgresVersion=$postgresVersion"
     echo "postgisVersion=$postgisVersion"
     echo "bundleType=$bundleType"
diff --git a/update.sh b/update.sh
index f13d7045..38c4a7e0 100755
--- a/update.sh
+++ b/update.sh
@@ -2,6 +2,7 @@
 set -Eeuo pipefail
 # Source environment variables and necessary configurations
 source tools/environment_init.sh
+[ -f ./versions.json ]
 
 # This code derived from:
 #   - URL: https://github.com/docker-library/postgres/blob/master/versions.sh
@@ -13,16 +14,16 @@ cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 echo " "
 
 # Generate versions.json metadata file
-./versions.sh "$@"
+./tools/versions.sh "$@"
 
 # apply version.json - generate Dockerfiles
-./apply-templates.sh "$@"
+./tools/apply-templates.sh "$@"
 
 # apply version.json - generate .github/workflows/main.yml and .circleci/config.yml
-./apply-ci.sh "$@"
+./tools/apply-ci.sh "$@"
 
 # apply version.json - generate manifest.sh
-./apply-manifest.sh "$@"
+./tools/apply-manifest.sh "$@"
 
 # apply version.json - generate README.md
-./apply-readme.sh "$@"
+./tools/apply-readme.sh "$@"