diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000..5c98b42884
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000..97626ba454
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000..d22b02bd88
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="lambda">
+    <option name="showAllHandlerGutterIcons" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000..2c3be543e5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/postgres.iml" filepath="$PROJECT_DIR$/postgres.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..35eb1ddfbb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/11/Dockerfile b/11/Dockerfile
index 29af4398b4..d03631a039 100644
--- a/11/Dockerfile
+++ b/11/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -71,7 +71,7 @@ RUN set -ex; \
 	apt-key list
 
 ENV PG_MAJOR 11
-ENV PG_VERSION 11.6-1.pgdg90+1
+ENV PG_VERSION 11.5-1+deb10u1
 
 RUN set -ex; \
 	\
@@ -82,22 +82,13 @@ RUN set -ex; \
 	case "$dpkgArch" in \
 		amd64|i386|ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
-			\
-			case "$PG_MAJOR" in \
-				9.* | 10 ) ;; \
-				*) \
-# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
-# TODO remove this once we hit buster+
-					echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
-					;; \
-			esac; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
diff --git a/11/Makefile b/11/Makefile
new file mode 100644
index 0000000000..cc470fe73c
--- /dev/null
+++ b/11/Makefile
@@ -0,0 +1,10 @@
+
+all: build
+
+build:
+	docker build -t moovement/postgis:11-2.5 .
+
+update:
+	echo "docker run --rm -v $$(pwd):/work -w /work buildpack-deps ./update.sh"
+
+.PHONY: all build update
diff --git a/11/build_push_image.sh b/11/build_push_image.sh
new file mode 100755
index 0000000000..9252ed8c30
--- /dev/null
+++ b/11/build_push_image.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -e
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+pushd "${PROJECT_ROOT}"
+: "${DOCKER_IMAGE:='moovement/postgres:11'}"
+: "${DOCKER_REGISTRY:='docker.moovement.co'}"
+: "${REPO:="${DOCKER_REGISTRY}/${DOCKER_IMAGE}"}"
+
+docker build -t ${DOCKER_IMAGE} .
+#docker build -t moovement/postgres:11 .
+docker tag ${DOCKER_IMAGE} ${REPO}
+#docker tag moovement/postgres:11 docker.moovement.co/moovement/postgres:11
+#eval "$(aws ecr get-login --no-include-email --region "${AWS_REGION}")"
+docker push "${REPO}"
+#docker push docker.moovement.co/moovement/postgres:11
+#ecs deploy ${ECS_CLUSTER_NAME} ${ECS_SERVICE_NAME} --image ${ECS_CONTAINER_NAME} ${REPO} --timeout 6000
+popd
diff --git a/postgres.iml b/postgres.iml
new file mode 100644
index 0000000000..8021953ed9
--- /dev/null
+++ b/postgres.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file