diff --git a/CHANGES.md b/CHANGES.md
index 5df9d41..e54d361 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+## Unreleased
+
+* switch to official python base image over `bitnami`
+* switch to preferred `ENV` setting in Dockerfile
+
 ## 0.16.0 (2025-04-30)
 
 * new Range request parsing logic to make sure it works with S3 and HTTPS files
diff --git a/Dockerfile b/Dockerfile
index d52842e..08b8c81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG PYTHON_VERSION=3.11
 
-FROM bitnami/python:${PYTHON_VERSION}
+FROM python:${PYTHON_VERSION}
 RUN apt update && apt upgrade -y \
   && rm -rf /var/lib/apt/lists/*
 
@@ -14,10 +14,10 @@ COPY LICENSE LICENSE
 
 RUN pip install . --no-cache-dir --upgrade
 
-ENV GDAL_INGESTED_BYTES_AT_OPEN 32768
-ENV GDAL_DISABLE_READDIR_ON_OPEN EMPTY_DIR
-ENV GDAL_HTTP_MERGE_CONSECUTIVE_RANGES YES
-ENV GDAL_HTTP_MULTIPLEX YES
-ENV GDAL_HTTP_VERSION 2
-ENV VSI_CACHE TRUE
-ENV VSI_CACHE_SIZE 536870912
+ENV GDAL_INGESTED_BYTES_AT_OPEN=32768
+ENV GDAL_DISABLE_READDIR_ON_OPEN=EMPTY_DIR
+ENV GDAL_HTTP_MERGE_CONSECUTIVE_RANGES=YES
+ENV GDAL_HTTP_MULTIPLEX=YES
+ENV GDAL_HTTP_VERSION=2
+ENV VSI_CACHE=TRUE
+ENV VSI_CACHE_SIZE=536870912