diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b350c51..35065b2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -16,13 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         PYTHON:
-          - 3.5.10
-          - 3.6.15
-          - 3.7.17
           - 3.8.19
           - 3.9.19
           - 3.10.14
-          - 3.11.8
+          - 3.11.9
           - 3.12.2
     steps:
       - name: Checkout repository
diff --git a/Dockerfile b/Dockerfile
index 8aebfdc..f36e7a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,9 +26,10 @@ RUN export PYTHON_SEMVER="${PYTHON_MAJOR}.${PYTHON_PATCH}" \
   && cd Python-${PYTHON_SEMVER} \
   && ./configure --enable-optimizations --with-ensurepip \
   && make altinstall \
-  && pip${PYTHON_MAJOR} install six \
   && ln -s /usr/local/bin/python${PYTHON_MAJOR} /usr/local/bin/python3 \
   && ln -s /usr/local/bin/pip${PYTHON_MAJOR} /usr/local/bin/pip \
+  && pip install --upgrade pip \
+  && pip install six \
   # Clean up
 	&& apt-get remove -f -y --purge --auto-remove build-essential \
 	&& apt-get clean \
diff --git a/Makefile b/Makefile
index f09a4b5..6de270b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ FILE = Dockerfile
 IMAGE = flaconi/jnlp-slave-py
 TAG = latest
 
-# Base image version
-JENKINS_AGENT = 3206.vb_15dcf73f6a_9-9
+# Base image version: https://github.com/jenkinsci/docker-agent/releases/latest
+JENKINS_AGENT = 3206.vb_15dcf73f6a_9-9-jdk17
 
-# Python versions: $PYTHON_MAJOR.PYTHON_PATCH
+# Python versions: $PYTHON_MAJOR.$PYTHON_PATCH
 PYTHON_MAJOR = 3.12
 PYTHON_PATCH = 2
 
diff --git a/README.md b/README.md
index 08bcfb3..72b0143 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
-# docker-jnlp-slave-py
-A Jenkins agent which can connect to Jenkins using JNLP4 + python
+# Jenkins Agent and python
+
+[![GitHub release](https://img.shields.io/github/release/flaconi/docker-jnlp-slave-py.svg?label=changelog)](https://github.com/flaconi/docker-jnlp-slave-py/releases/latest)
+[![Docker Pulls](https://img.shields.io/docker/pulls/flaconi/jnlp-slave-py.svg)](https://hub.docker.com/r/flaconi/jnlp-slave-py/)
+
+A Jenkins agent which can connect to Jenkins using JNLP4 + python preinstalled