diff --git a/Dockerfile b/Dockerfile
index 1386855e4..e5c5488c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,5 @@
 ARG base_image=py39
 
-FROM centos:8 as lower-constraints
-
-ENV CONSTRAINS_FILE=lower-constraints.txt
-ENV INSTALL_PACKAGES="dnf install -y"
-ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
-ENV PYTHON_VERSION=3
-
-USER 0
-
-
 FROM fedora:34 as py39
 
 ENV CONSTRAINS_FILE=upper-constraints.txt
@@ -17,8 +7,6 @@ ENV INSTALL_PACKAGES="dnf install -y"
 ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
 ENV PYTHON_VERSION=3.9
 
-USER 0
-
 
 FROM fedora:35 as py310
 
@@ -27,7 +15,10 @@ ENV INSTALL_PACKAGES="dnf install -y"
 ENV INSTALL_PACKAGES_GROUP="dnf groupinstall -y"
 ENV PYTHON_VERSION=3.10
 
-USER 0
+
+FROM py39 as lower-constraints
+
+ENV CONSTRAINS_FILE=lower-constraints.txt
 
 
 FROM ${base_image} as base
diff --git a/infrared_plugin/Dockerfile b/infrared_plugin/Dockerfile
index a9cc5d238..6540eb20c 100644
--- a/infrared_plugin/Dockerfile
+++ b/infrared_plugin/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:8 as base
+FROM fedora:34 as base
 
 ENV TOBIKO_INFRARED_DIR /tobiko-infrared
 ENV OPENSHIFT_INFRARED_URL=http://code.engineering.redhat.com/gerrit/openshift-ir-plugin.git
@@ -9,7 +9,8 @@ ENV IR_EXTRA_ARGS ""
 
 # Install common binary dependencies
 RUN dnf install -y git python3 rsync which
-RUN python3 -m pip install --upgrade wheel setuptools pip
+RUN python3 -m ensurepip --upgrade
+RUN python3 -m pip install --upgrade wheel setuptools
 
 # Creates directories and use infrared home dir as home
 RUN mkdir -p "${IR_HOME}" "${REPORT_DIR}"
@@ -21,7 +22,7 @@ FROM base as install
 # Install wheels
 ADD requirements.txt .
 
-RUN pip install -r requirements.txt
+RUN python3 -m pip install -r requirements.txt
 
 
 FROM base as configure