diff --git a/README.md b/README.md
index df9a50ec..9a3751af 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ You will need:
 
 Just launch:
 
-    python setup.py install
+    python3 setup.py install
 
 Example of the installation at:
 
diff --git a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-debian10.txt b/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2.txt
similarity index 62%
rename from test/docker-files/docker-file-COMPLIANCE-REPOSITORY-debian10.txt
rename to test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2.txt
index 8b6f1a62..3541df10 100644
--- a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-debian10.txt
+++ b/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2.txt
@@ -1,14 +1,19 @@
-FROM       naparuba/debian-10
+FROM       amazonlinux:2
 LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
 
+ADD        test/docker-helper/  /
+# Amazon can be slow and it broke tests...
+RUN        /yum_install yum-plugin-fastestmirror
+RUN        /yum_install python3
 
-# Need for debug and test
-RUN        /apt_get_install   procps
+ENV        PYTHON_EXE=/usr/bin/python3
 
 ADD        . /root/opsbro-oss
+
+
 WORKDIR    /root/opsbro-oss
 
-RUN        $PYTHON_EXE setup.py install
+RUN        python3 setup.py install
 
 # Copy the mail pack into a local one to enable modification
 RUN        opsbro  packs overload global.mongodb
diff --git a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2017.12.txt b/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2017.12.txt
deleted file mode 100644
index 1cdb9964..00000000
--- a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-amazonlinux-2017.12.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM       amazonlinux:2017.12
-LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
-
-# NOTE: there is a bug in this version (like fedora 26) with a pypi connection impossible without the glibc update
-ADD        test/docker-helper/  /
-RUN        /yum_update   glibc
-RUN        /yum_install  python
-RUN        /yum_install  python-jinja2
-RUN        /yum_install  python-setuptools
-
-
-
-ADD        . /root/opsbro-oss
-
-
-WORKDIR    /root/opsbro-oss
-
-RUN        python setup.py install
-
-# Copy the mail pack into a local one to enable modification
-RUN        opsbro  packs overload global.mongodb
-# Copy the new compliance value
-ADD        test/test-files/test-compliance-repository/compliance/*   /var/lib/opsbro/local-configuration/packs/mongodb/compliance/
-
-ENTRYPOINT     test/test_compliance-repository.sh
diff --git a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-20.04.txt b/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-24.04.txt
similarity index 98%
rename from test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-20.04.txt
rename to test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-24.04.txt
index e4e63744..0fb44190 100644
--- a/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-20.04.txt
+++ b/test/docker-files/docker-file-COMPLIANCE-REPOSITORY-ubuntu-24.04.txt
@@ -1,4 +1,4 @@
-FROM       ubuntu:20.04
+FROM       ubuntu:24.04
 LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
 
 ADD        test/docker-helper/  /
diff --git a/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-debian11.txt b/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-debian11.txt
deleted file mode 100644
index 68f1c1ca..00000000
--- a/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-debian11.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM       naparuba/debian-11
-LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
-
-
-ADD        . /root/opsbro-oss
-WORKDIR    /root/opsbro-oss
-
-RUN        $PYTHON_EXE setup.py install
-
-# Copy the mail pack into a local one to enable modification
-RUN        opsbro  packs overload global.linux
-# Copy the new compliance value
-ADD        test/test-files/test-compliance-system-user/compliance/*.yml   /var/lib/opsbro/local-configuration/packs/linux/compliance/
-
-ENTRYPOINT     test/test_compliance-system-user.sh
diff --git a/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-20.04.txt b/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-24.04.txt
similarity index 83%
rename from test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-20.04.txt
rename to test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-24.04.txt
index 9e90acc6..697f06a7 100644
--- a/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-20.04.txt
+++ b/test/docker-files/docker-file-COMPLIANCE-SYSTEM-USER-ubuntu-24.04.txt
@@ -1,15 +1,15 @@
-FROM       ubuntu:20.04
+FROM       ubuntu:24.04
 LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
 
 ADD        test/docker-helper/  /
-RUN        /apt_get_install python
+RUN        /apt_get_install python3
 
 ADD        . /root/opsbro-oss
 
 
 WORKDIR    /root/opsbro-oss
 
-RUN        python setup.py install
+RUN        python3 setup.py install
 
 # Copy the mail pack into a local one to enable modification
 RUN        opsbro  packs overload global.linux