diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index a586941..7ef6be4 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -10,11 +10,10 @@ RUN \
  apk --no-cache add libxml2 libxslt
 
 RUN \
+ # Add edge/testing repository
+ echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib \
- && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
- && apk --no-cache add geos \
- && sed -i '$ d' /etc/apk/repositories
+ && apk --no-cache add geos@edge libjpeg-turbo libmagic libpq py2-pip zlib
 
 RUN \
  # Install build dependencies
diff --git a/cts/Dockerfile b/cts/Dockerfile
index ad0ce7b..408a7a5 100644
--- a/cts/Dockerfile
+++ b/cts/Dockerfile
@@ -6,11 +6,10 @@ RUN \
  apk --no-cache add python2
 
 RUN \
+ # Add edge/testing repository
+ echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- apk --no-cache add libpq zlib \
- && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
- && apk --no-cache add geos \
- && sed -i '$ d' /etc/apk/repositories
+ && apk --no-cache add geos@edge libpq zlib
 
 RUN \
  # Install build dependencies
diff --git a/sahana/Dockerfile b/sahana/Dockerfile
index 177139d..7a4aa3c 100644
--- a/sahana/Dockerfile
+++ b/sahana/Dockerfile
@@ -10,11 +10,10 @@ RUN \
  apk --no-cache add libxml2 libxslt
 
 RUN \
+ # Add edge/testing repository
+ echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install runtime dependencies
- apk --no-cache add py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests \
- && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
- && apk --no-cache add geos py-gdal \
- && sed -i '$ d' /etc/apk/repositories
+ && apk --no-cache add geos@edge py-gdal@edge py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests
 
 RUN \
  # Install build dependencies