diff --git a/Dockerfile b/Dockerfile
index 5cd00e8..5f1a9e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,8 +61,8 @@ ARG ADD_DEB_PACKAGES=""
 # ENV settings
 ENV TZ=${TIMEZONE} \
 	DEBIAN_FRONTEND="noninteractive" \
-	DEB_BUILD_DEPS="tzdata build-essential apt-utils curl git unzip" \
-	DEB_PACKAGES="locales python3-pip python3-setuptools python3-distutils python3-gdal python3-psycopg2 python3-xarray python3-scipy python3-netcdf4 python3-rasterio python3-fiona python3-yaml python3-dateutil python3-pandas python3-tz python3-flask python3-unicodecsv python3-pyproj python3-click python3-greenlet python3-gevent python3-wheel gunicorn libsqlite3-mod-spatialite python3-elasticsearch ${ADD_DEB_PACKAGES}"
+	DEB_BUILD_DEPS="software-properties-common curl unzip" \
+	DEB_PACKAGES="python3-pip python3-setuptools python3-distutils python3-gdal python3-psycopg2 python3-xarray python3-scipy python3-netcdf4 python3-rasterio python3-fiona python3-yaml python3-dateutil python3-pandas python3-tz python3-flask python3-unicodecsv python3-pyproj python3-click python3-greenlet python3-gevent python3-wheel gunicorn libsqlite3-mod-spatialite python3-elasticsearch ${ADD_DEB_PACKAGES}"
 
 RUN mkdir -p /pygeoapi/pygeoapi
 # Add files required for pip/setuptools
@@ -72,17 +72,10 @@ ADD pygeoapi/__init__.py /pygeoapi/pygeoapi/
 # Run all installs
 RUN \
 	# Install dependencies
-	apt-get update -y \
-	&& apt-get install -y --fix-missing --no-install-recommends software-properties-common \
+	apt-get update -y && apt-get upgrade  -y \
+	&& apt-get install -y --fix-missing --no-install-recommends ${DEB_BUILD_DEPS}  \
 	&& add-apt-repository ppa:ubuntugis/ubuntugis-unstable \
-	&& apt-get --no-install-recommends install -y ${DEB_BUILD_DEPS} ${DEB_PACKAGES} \
-	# Timezone
-	&& cp /usr/share/zoneinfo/${TZ} /etc/localtime\
-	&& dpkg-reconfigure tzdata \
-	# Locale
-	&& sed -i -e "s/# ${LOCALE} UTF-8/${LOCALE} UTF-8/" /etc/locale.gen \
-	&& dpkg-reconfigure --frontend=noninteractive locales \
-	&& update-locale LANG=${LOCALE} \
+	&& apt-get --no-install-recommends install -y ${DEB_PACKAGES} \
 	&& echo "For ${TZ} date=$(date)" && echo "Locale=$(locale)" \
 	# Install pygeoapi
 	&& cd /pygeoapi \
@@ -95,10 +88,10 @@ RUN \
 	&& mkdir /schemas.opengis.net \
 	&& curl -O http://schemas.opengis.net/SCHEMAS_OPENGIS_NET.zip \
 	&& unzip ./SCHEMAS_OPENGIS_NET.zip "ogcapi/*" -d /schemas.opengis.net \
+	&& rm -f ./SCHEMAS_OPENGIS_NET.zip \
 	# Cleanup TODO: remove unused Locales and TZs
 	&& apt-get remove --purge -y ${DEB_BUILD_DEPS} \
 	&& apt autoremove -y  \
-	&& apt-get --no-install-recommends install -y ${DEB_PACKAGES} \
 	&& rm -rf /var/lib/apt/lists/*
 
 ADD . /pygeoapi