diff --git a/12-master/Dockerfile b/12-master/Dockerfile
index 7a756ae5f..20c388135 100644
--- a/12-master/Dockerfile
+++ b/12-master/Dockerfile
@@ -40,14 +40,15 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
       make \
       pkg-config \
       protobuf-c-compiler \
-      xsltproc \
-      libpcre3-dev
+      xsltproc
 
 # sfcgal
 ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
     && rm -fr /usr/src/SFCGAL
 
 # proj
-###ENV PROJ_VERSION master
-###ENV PROJ_GIT_HASH db2950e56ea26a0949b71378d73559a16fc40f26
-
-### Issue with proj v8 not being compatible
-### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
-### Below is a temp fix
-ENV PROJ_VERSION 7.2.1
-ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
+ENV PROJ_VERSION master
+ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
 
 RUN set -ex \
     && cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-###ENV GEOS_GIT_HASH 17ab55a55aeed3e5a0a83b05428463bf1646471f
-### lock Commits on Jan 19, 2021
-### temp fix,  see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
-ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
+ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
 
 RUN set -ex \
     && cd /usr/src \
@@ -121,7 +112,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH ae1531a20a4079fc0739676a3c01c760f674bbf6
+ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
 
 RUN set -ex \
     && cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
       libgmpxx4ldbl \
       libjson-c3 \
       libmpfr6 \
+      libpcre3 \
       libprotobuf-c1 \
       libtiff5 \
       libxml2 \
       sqlite3 \
-      libpcre3 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local /usr/local
 
+ENV SFCGAL_GIT_HASH e1e67b58abf0e51dcce3bbb0ebd2429cca36c945
+ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
+ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
+ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
+
 # Minimal command line test.
 RUN set -ex \
     && ldconfig \
@@ -191,7 +187,7 @@ RUN set -ex \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 52f942583b5b9c975799bf8eefadc756a5f56215
+ENV POSTGIS_GIT_HASH d5f7a2adc923869ebe17b5fd0a6fa299d5b9c20c
 
 RUN set -ex \
     && apt-get update \
@@ -203,8 +199,8 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
       libtool \
       libxml2-dev \
-      libpcre3-dev \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \
diff --git a/13-master/Dockerfile b/13-master/Dockerfile
index cbbbd5aa8..c7eed9b14 100644
--- a/13-master/Dockerfile
+++ b/13-master/Dockerfile
@@ -40,14 +40,15 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
       make \
       pkg-config \
       protobuf-c-compiler \
-      xsltproc \
-      libpcre3-dev
+      xsltproc
 
 # sfcgal
 ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
     && rm -fr /usr/src/SFCGAL
 
 # proj
-###ENV PROJ_VERSION master
-###ENV PROJ_GIT_HASH db2950e56ea26a0949b71378d73559a16fc40f26
-
-### Issue with proj v8 not being compatible
-### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
-### Below is a temp fix
-ENV PROJ_VERSION 7.2.1
-ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
+ENV PROJ_VERSION master
+ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
 
 RUN set -ex \
     && cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-###ENV GEOS_GIT_HASH 17ab55a55aeed3e5a0a83b05428463bf1646471f
-### lock Commits on Jan 19, 2021
-### temp fix,  see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
-ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
+ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
 
 RUN set -ex \
     && cd /usr/src \
@@ -121,7 +112,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH ae1531a20a4079fc0739676a3c01c760f674bbf6
+ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
 
 RUN set -ex \
     && cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
       libgmpxx4ldbl \
       libjson-c3 \
       libmpfr6 \
+      libpcre3 \
       libprotobuf-c1 \
       libtiff5 \
       libxml2 \
       sqlite3 \
-      libpcre3 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local /usr/local
 
+ENV SFCGAL_GIT_HASH e1e67b58abf0e51dcce3bbb0ebd2429cca36c945
+ENV PROJ_GIT_HASH 381d4f6ff3d18efbcd4fdb626200dddab5f2c115
+ENV GEOS_GIT_HASH 32b99ca05b99b733dcd2c274c5f14e6402e6e5a1
+ENV GDAL_GIT_HASH 9ea9b3d4c4255ea748321bf707b2cf6e3416f4bf
+
 # Minimal command line test.
 RUN set -ex \
     && ldconfig \
@@ -191,7 +187,7 @@ RUN set -ex \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 52f942583b5b9c975799bf8eefadc756a5f56215
+ENV POSTGIS_GIT_HASH d5f7a2adc923869ebe17b5fd0a6fa299d5b9c20c
 
 RUN set -ex \
     && apt-get update \
@@ -203,8 +199,8 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
       libtool \
       libxml2-dev \
-      libpcre3-dev \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \
diff --git a/Dockerfile.master.template b/Dockerfile.master.template
index 7b7bb9729..e8fed9a59 100644
--- a/Dockerfile.master.template
+++ b/Dockerfile.master.template
@@ -40,14 +40,15 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
@@ -56,8 +57,7 @@ RUN set -ex \
       make \
       pkg-config \
       protobuf-c-compiler \
-      xsltproc \
-      libpcre3-dev
+      xsltproc
 
 # sfcgal
 ENV SFCGAL_VERSION master
@@ -78,14 +78,8 @@ RUN set -ex \
     && rm -fr /usr/src/SFCGAL
 
 # proj
-###ENV PROJ_VERSION master
-###ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
-
-### Issue with proj v8 not being compatible
-### see https://github.com/postgis/docker-postgis/pull/220#issuecomment-765864268
-### Below is a temp fix
-ENV PROJ_VERSION 7.2.1
-ENV PROJ_GIT_HASH 1212e9b818e4511cc9389b9bdb5daa0bec1a12bd
+ENV PROJ_VERSION master
+ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
 
 RUN set -ex \
     && cd /usr/src \
@@ -101,10 +95,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-###ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
-### lock Commits on Jan 19, 2021
-### temp fix,  see https://github.com/postgis/docker-postgis/pull/220#issuecomment-770156316
-ENV GEOS_GIT_HASH 98641ab14e01a6b5a6339f49fa6f1bee4424c7d0
+ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
 
 RUN set -ex \
     && cd /usr/src \
@@ -170,15 +161,20 @@ RUN set -ex \
       libgmpxx4ldbl \
       libjson-c3 \
       libmpfr6 \
+      libpcre3 \
       libprotobuf-c1 \
       libtiff5 \
       libxml2 \
       sqlite3 \
-      libpcre3 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/local /usr/local
 
+ENV SFCGAL_GIT_HASH %%SFCGAL_GIT_HASH%%
+ENV PROJ_GIT_HASH %%PROJ_GIT_HASH%%
+ENV GEOS_GIT_HASH %%GEOS_GIT_HASH%%
+ENV GDAL_GIT_HASH %%GDAL_GIT_HASH%%
+
 # Minimal command line test.
 RUN set -ex \
     && ldconfig \
@@ -203,8 +199,8 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
@@ -258,20 +254,20 @@ RUN set -ex \
       build-essential \
       ca-certificates \
       cmake \
-      git \
       g++ \
+      git \
       libboost-all-dev \
       libcgal-dev \
       libcurl4-gnutls-dev \
       libgmp-dev \
       libjson-c-dev \
       libmpfr-dev \
+      libpcre3-dev \
       libprotobuf-c-dev \
       libsqlite3-dev \
       libtiff-dev \
       libtool \
       libxml2-dev \
-      libpcre3-dev \
       make \
       pkg-config \
       postgresql-server-dev-$PG_MAJOR \