diff --git a/database/Dockerfile b/database/Dockerfile
index 8cbdf95c4..5a81251f4 100644
--- a/database/Dockerfile
+++ b/database/Dockerfile
@@ -1,6 +1,5 @@
-# RedHat UBI 8 with nodejs 14
-FROM postgis/postgis:13-master
+FROM postgres:13
 
-# Enable pgcrypto extension on startup
-RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
-        /docker-entrypoint-initdb.d/10_postgis.sh
+# Enable extensions using this pattern on startup
+#RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
+#        /docker-entrypoint-initdb.d/10_postgis.sh
diff --git a/database/postgis/Dockerfile b/database/postgis/Dockerfile
new file mode 100644
index 000000000..8cbdf95c4
--- /dev/null
+++ b/database/postgis/Dockerfile
@@ -0,0 +1,6 @@
+# RedHat UBI 8 with nodejs 14
+FROM postgis/postgis:13-master
+
+# Enable pgcrypto extension on startup
+RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
+        /docker-entrypoint-initdb.d/10_postgis.sh
diff --git a/database/postgres/Dockerfile b/database/postgres/Dockerfile
deleted file mode 100644
index 5a81251f4..000000000
--- a/database/postgres/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM postgres:13
-
-# Enable extensions using this pattern on startup
-#RUN sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' \
-#        /docker-entrypoint-initdb.d/10_postgis.sh