diff --git a/Dockerfile b/Dockerfile
index 19c858e..871903e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
 #
 # =================================================================
 
-FROM ubuntu:focal
+FROM ubuntu:focal-20201106
 
 LABEL maintainer="Just van den Broecke <justb4@gmail.com>"
 
@@ -53,9 +53,13 @@ LABEL maintainer="Just van den Broecke <justb4@gmail.com>"
 # via Docker Volume mapping or within a docker-compose.yml file. See example at
 # https://github.com/geopython/demo.pygeoapi.io/tree/master/services/pygeoapi
 
+# Build arguments
+# add "--build-arg BUILD_DEV_IMAGE=true" to Docker build command when building with test/doc tools
+
 # ARGS
 ARG TIMEZONE="Europe/London"
 ARG LOCALE="en_US.UTF-8"
+ARG BUILD_DEV_IMAGE="false"
 ARG ADD_DEB_PACKAGES="python3-gdal python3-psycopg2 python3-xarray python3-scipy python3-netcdf4 python3-rasterio python3-fiona python3-pandas python3-pyproj python3-elasticsearch python3-pymongo python3-zarr python3-tinydb"
 
 # ENV settings
@@ -80,9 +84,8 @@ RUN \
 	# Install pygeoapi
 	&& cd /pygeoapi \
 	&& pip3 install -r requirements.txt \
-	&& pip3 install -r requirements-dev.txt \
-	&& pip3 install -r requirements-manager.txt \
-	&& pip3 install -r requirements-provider.txt \
+	# Optionally add development/test/doc packages
+	&& if [ "$BUILD_DEV_IMAGE" = "true" ] ; then pip3 install -r requirements-dev.txt; fi \
 	&& pip3 install -e . \
 	# OGC schemas local setup
 	&& mkdir /schemas.opengis.net \