diff --git a/Dockerfile b/Dockerfile
index 91c246b..d3e884b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV TZ=Australia/Hobart
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 ENV PATH /home/builder/.local/bin:$PATH
-ENV PYTHON_VERSION 3.5.2
+ENV PYTHON_VERSION 3.8.13
 
 RUN apt-get update && \
     apt-get install -y software-properties-common && \
@@ -15,11 +15,6 @@ RUN apt-get update && \
 
 RUN add-apt-repository ppa:rael-gc/rvm && apt-get update
 
-RUN if [ X"$PYTHON_VERSION" = X"3.5.2" ]; \
-        then apt-get install -y libssl1.0-dev; \
-        else apt-get install -y  libssl-dev; \
-    fi
-
 RUN apt-get install -y --no-install-recommends \
     build-essential \
     ca-certificates \
@@ -29,11 +24,10 @@ RUN apt-get install -y --no-install-recommends \
     python3-dev \
     wget \
     libffi-dev \
-    # Pyenv pre-requisites
-    make zlib1g-dev libbz2-dev libreadline-dev \
-    libsqlite3-dev wget curl llvm libncurses5-dev \
-    libncursesw5-dev xz-utils tk-dev libffi-dev \
-    liblzma-dev python-openssl \
+    # Pyenv pre-requisites (from https://github.com/pyenv/pyenv/wiki#suggested-build-environment)
+    make build-essential libssl-dev zlib1g-dev \
+    libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
+    libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Set-up necessary Env vars for PyEnv
@@ -48,13 +42,12 @@ RUN set -ex \
     && pyenv rehash \
     && chmod -R a+w $PYENV_ROOT/shims
 
-RUN pip install --upgrade pip==20.3.4 setuptools==50.3.2
+RUN pip install --upgrade pip==22.1.2 setuptools==63.1.0 wheel
 
 RUN pip install \
-    Cython==0.29 \
-    numpy>=1.13.0 \
-    bump2version==0.5.10 \
-    wheel
+    Cython==0.29.30 \
+    bump2version==1.0.1 \
+    numpy==1.23.0
 
 RUN useradd --create-home --no-log-init --shell /bin/bash --uid $BUILDER_UID builder
 USER builder
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ac178b..f487b1f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   dev:
-    image: ncwriter-build
+    image: aodntools-build
     build:
       context: .
       args: