diff --git a/index/Dockerfile b/index/Dockerfile
index 9412334..b75f1e4 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.0
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \
@@ -6,6 +6,12 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 RUN apt-get update \
     && apt-get upgrade -y \
+    # Python virt environment
+    && apt-get install -y --no-install-recommends \
+        virtualenv \
+    && mkdir /virtualenv \
+    && virtualenv /virtualenv/python3.12 \
+    && . /virtualenv/python3.12/bin/activate \
     # Developer convenience
     && apt-get install -y --no-install-recommends \
         git \
@@ -14,21 +20,23 @@ RUN apt-get update \
         unzip \
         # Build tools\
         build-essential \
-        python3-pip \
         python3-dev \
         # For Psycopg2
-        libpq-dev\
+        libpq-dev \
         # Yaml parsing speedup, I think
         libyaml-dev \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
-        postgresql-client-14 \
+        postgresql-client-16 \
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
+ENV VIRTUAL_ENV /virtualenv/python3.12
+ENV PATH /virtualenv/python3.12/bin:$PATH
+
 COPY requirements.txt constraints.txt version.txt /conf/
 
 RUN cat /conf/version.txt \
diff --git a/index/constraints.txt b/index/constraints.txt
index dd46c78..720f40b 100644
--- a/index/constraints.txt
+++ b/index/constraints.txt
@@ -205,7 +205,7 @@ numpy==1.26.4
     #   xarray
 odc-apps-cloud==0.2.3
     # via -r requirements.txt
-odc-apps-dc-tools==0.2.16
+odc-apps-dc-tools==0.2.17
     # via -r requirements.txt
 odc-cloud==0.2.5
     # via
diff --git a/index/version.txt b/index/version.txt
index d15723f..1c09c74 100644
--- a/index/version.txt
+++ b/index/version.txt
@@ -1 +1 @@
-0.3.2
+0.3.3