diff --git a/.github/workflows/s3tests.yml b/.github/workflows/s3tests.yml
index f01b86bb4..3ba43e816 100644
--- a/.github/workflows/s3tests.yml
+++ b/.github/workflows/s3tests.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Fix S3 tests bucket creation conflicts
         run: |
-          python3 test/s3/fix_s3_tests_bucket_conflicts.py
+          python3 test/s3/compatibility/fix_s3_tests_bucket_conflicts.py
         env:
           S3_TESTS_PATH: s3-tests
 
@@ -388,7 +388,7 @@ jobs:
 
       - name: Fix S3 tests bucket creation conflicts
         run: |
-          python3 test/s3/fix_s3_tests_bucket_conflicts.py
+          python3 test/s3/compatibility/fix_s3_tests_bucket_conflicts.py
         env:
           S3_TESTS_PATH: s3-tests
 
diff --git a/test/s3/compatibility/Dockerfile b/test/s3/compatibility/Dockerfile
index a3a76b742..9aa15269d 100644
--- a/test/s3/compatibility/Dockerfile
+++ b/test/s3/compatibility/Dockerfile
@@ -1,21 +1,23 @@
 # the tests only support python 3.6, not newer
 #FROM ubuntu:latest
-FROM python:3.6.15-slim-buster
+FROM python:3.6.15-slim-bullseye
 
 # Installed required system deps
 RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y git-core sudo tzdata
+    && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y -qq git-core sudo tzdata ca-certificates libxml2-dev libxslt1-dev zlib1g-dev python3-lxml gcc python3-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install python deps
 RUN pip install virtualenv
 
 # Clone Ceph S3 tests
-RUN git clone https://github.com/ceph/s3-tests.git
+COPY fix_s3_tests_bucket_conflicts.py /tmp/fix_s3_tests_bucket_conflicts.py
+ENV S3_TESTS_PATH=s3-tests
+RUN git clone https://github.com/ceph/s3-tests.git \
+    && python3 /tmp/fix_s3_tests_bucket_conflicts.py
 
 WORKDIR s3-tests
 
-# Pin to a certain commit on ceph/s3-tests
-# https://github.com/ceph/s3-tests/commit/9a6a1e9f197fc9fb031b809d1e057635c2ff8d4e
-RUN git checkout 9a6a1e9f197fc9fb031b809d1e057635c2ff8d4e
-
-RUN ./bootstrap
+RUN pip install -r requirements.txt \
+    && pip install tox \
+    && pip install -e .
diff --git a/test/s3/fix_s3_tests_bucket_conflicts.py b/test/s3/compatibility/fix_s3_tests_bucket_conflicts.py
similarity index 100%
rename from test/s3/fix_s3_tests_bucket_conflicts.py
rename to test/s3/compatibility/fix_s3_tests_bucket_conflicts.py