diff --git a/Dockerfile b/Dockerfile
index e3ea3b19..47a238d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,26 @@
-FROM centos:latest
+FROM redhat/ubi9:latest
 
-LABEL name="VF development dockerfile"
-LABEL version="0.4"
+LABEL name="VF development container file"
+LABEL version="1.0"
 LABEL description="Provides environment for development of new validations."
 
 RUN dnf install -y git python3-pip gcc python3-devel jq
 
-#We copy contents of the local validations-libs repo with all of our changes
+# Copy contents of the local validations-libs repo with all of our changes
 COPY . /root/validations-libs
-#validations-common repo is cloned
+# validations-common repo is cloned
 RUN git clone https://opendev.org/openstack/validations-common /root/validations-common
 
-RUN python3 -m pip install cryptography==3.3
+RUN python3 -m pip install /root/validations-libs &&\
+    python3 -m pip install -r /root/validations-libs/test-requirements.txt
 
-RUN cd /root/validations-libs && \
-    python3 -m pip install . && \
-    python3 -m pip install -r test-requirements.txt
+RUN python3 -m pip install /root/validations-common
 
-RUN cd /root/validations-common && \
-    python3 -m pip install .
-
-#Setting up the default directory structure for both ansible,
-#and the VF
-RUN ln -s /usr/local/share/ansible  /usr/share/ansible && \
+# Setting up the default directory structure for both ansible,
+# and the VF
+RUN ln -s /usr/local/share/ansible  /usr/share/ansible &&\
     mkdir -p /var/log/validations
-#Simplified ansible inventory is created, containing only localhost,
-#and defining the connection as local.
+# Simplified ansible inventory is created, containing only localhost,
+# and defining the connection as local.
 RUN mkdir -p /etc/ansible && \
     echo "localhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/dockerfiles/localvalidations/Dockerfile b/dockerfiles/localvalidations/Dockerfile
index e3ea3b19..47a238d3 100644
--- a/dockerfiles/localvalidations/Dockerfile
+++ b/dockerfiles/localvalidations/Dockerfile
@@ -1,30 +1,26 @@
-FROM centos:latest
+FROM redhat/ubi9:latest
 
-LABEL name="VF development dockerfile"
-LABEL version="0.4"
+LABEL name="VF development container file"
+LABEL version="1.0"
 LABEL description="Provides environment for development of new validations."
 
 RUN dnf install -y git python3-pip gcc python3-devel jq
 
-#We copy contents of the local validations-libs repo with all of our changes
+# Copy contents of the local validations-libs repo with all of our changes
 COPY . /root/validations-libs
-#validations-common repo is cloned
+# validations-common repo is cloned
 RUN git clone https://opendev.org/openstack/validations-common /root/validations-common
 
-RUN python3 -m pip install cryptography==3.3
+RUN python3 -m pip install /root/validations-libs &&\
+    python3 -m pip install -r /root/validations-libs/test-requirements.txt
 
-RUN cd /root/validations-libs && \
-    python3 -m pip install . && \
-    python3 -m pip install -r test-requirements.txt
+RUN python3 -m pip install /root/validations-common
 
-RUN cd /root/validations-common && \
-    python3 -m pip install .
-
-#Setting up the default directory structure for both ansible,
-#and the VF
-RUN ln -s /usr/local/share/ansible  /usr/share/ansible && \
+# Setting up the default directory structure for both ansible,
+# and the VF
+RUN ln -s /usr/local/share/ansible  /usr/share/ansible &&\
     mkdir -p /var/log/validations
-#Simplified ansible inventory is created, containing only localhost,
-#and defining the connection as local.
+# Simplified ansible inventory is created, containing only localhost,
+# and defining the connection as local.
 RUN mkdir -p /etc/ansible && \
     echo "localhost ansible_connection=local" > /etc/ansible/hosts