diff --git a/.ci/docker/Dockerfile.tpm2provisioner b/.ci/docker/Dockerfile.tpm2provisioner
index d7c603a3..52bf1b22 100644
--- a/.ci/docker/Dockerfile.tpm2provisioner
+++ b/.ci/docker/Dockerfile.tpm2provisioner
@@ -5,7 +5,7 @@ RUN yum -y update && yum clean all
 RUN yum install -y tpm2-tools libcurl procps-ng wget dbus python-requests python2-future python36-future && yum clean all
 
 # Install PACCOR for Device Info Gathering
-RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.4r1/paccor-1.1.4-1.noarch.rpm && yum -y install paccor-*.rpm && popd
+RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.4r2/paccor-1.1.4-2.noarch.rpm && yum -y install paccor-*.rpm && popd
 
 # Install Software TPM for Provisioning
 RUN mkdir ibmtpm && pushd ibmtpm && wget https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1332.tar.gz && tar -zxvf ibmtpm1332.tar.gz && cd src && make -j5 && popd
diff --git a/.ci/docker/Dockerfile.tpmprovisioner b/.ci/docker/Dockerfile.tpmprovisioner
index b475e8f4..a31a4301 100644
--- a/.ci/docker/Dockerfile.tpmprovisioner
+++ b/.ci/docker/Dockerfile.tpmprovisioner
@@ -8,7 +8,7 @@ RUN yum install -y java-1.8.0-openjdk wget util-linux chkconfig sed systemd gmp-
 RUN mkdir tpm_module && pushd tpm_module && wget https://github.com/nsacyber/HIRS/releases/download/v1.1.1/tpm_module-1.1.1-1574364941.0c2005.x86_64.rpm && yum -y install tpm_module-*.rpm && popd
 
 # Install PACCOR for Device Info Gathering
-RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.4r1/paccor-1.1.4-1.noarch.rpm && yum -y install paccor-*.rpm && popd
+RUN mkdir paccor && pushd paccor && wget https://github.com/nsacyber/paccor/releases/download/v1.1.4r2/paccor-1.1.4-2.noarch.rpm && yum -y install paccor-*.rpm && popd
 
 # Install Software TPM for Provisioning
 RUN mkdir tpm_emulator && pushd tpm_emulator && wget https://phoenixnap.dl.sourceforge.net/project/ibmswtpm/tpm4769tar.gz && tar -xzvf tpm4769tar.gz && pushd libtpm && ./autogen && ./configure && make && popd && pushd tpm && make -f makefile-tpm && popd && popd
diff --git a/.ci/system-tests/allcomponents_hirs_system_tests.sh b/.ci/system-tests/allcomponents_hirs_system_tests.sh
index abd99ab7..d5efc353 100755
--- a/.ci/system-tests/allcomponents_hirs_system_tests.sh
+++ b/.ci/system-tests/allcomponents_hirs_system_tests.sh
@@ -756,6 +756,10 @@ parseNvmeData () {
         manufacturer="" # Making this appear as it does on windows, lshw doesn't see nvme drives and nvme-cli doesn't return a manufacturer field
         model=$(nvmeGetModelNumberForDevice "$i")
         serial=$(nvmeGetNguidForDevice "$i")
+
+        if [[ $serial =~ ^[0]+$ ]]; then
+           serial=$(nvmeGetEuiForDevice "$i")
+        fi
         revision="" # empty for a similar reason to the manufacturer field
 
     if [[ -z "${manufacturer// }" ]]; then