diff --git a/roles/matrix-base/tasks/server_base/setup_centos.yml b/roles/matrix-base/tasks/server_base/setup_centos.yml
index 77b2866af11..07776d7f69e 100644
--- a/roles/matrix-base/tasks/server_base/setup_centos.yml
+++ b/roles/matrix-base/tasks/server_base/setup_centos.yml
@@ -20,7 +20,6 @@
 - name: Ensure yum packages are installed
   yum:
     name:
-      - docker-python
       - "{{ matrix_ntpd_package }}"
       - fuse
     state: latest
@@ -30,5 +29,6 @@
   yum:
     name:
       - "{{ matrix_docker_package_name }}"
+      - docker-python
     state: latest
   when: matrix_docker_installation_enabled|bool
diff --git a/roles/matrix-base/tasks/server_base/setup_debian.yml b/roles/matrix-base/tasks/server_base/setup_debian.yml
index c54b3cb6fef..88ea1c1def7 100644
--- a/roles/matrix-base/tasks/server_base/setup_debian.yml
+++ b/roles/matrix-base/tasks/server_base/setup_debian.yml
@@ -27,7 +27,6 @@
 - name: Ensure APT packages are installed
   apt:
     name:
-      - "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
       - "{{ matrix_ntpd_package }}"
       - fuse
     state: latest
@@ -37,5 +36,6 @@
   apt:
     name:
       - "{{ matrix_docker_package_name }}"
+      - "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
     state: latest
   when: matrix_docker_installation_enabled|bool