diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-complex.eb b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-complex.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f538ad515db6c2bb54e6234dd1862eff727766b
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-complex.eb
@@ -0,0 +1,56 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-complex'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with complex numbers only and with default 4-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'gpsmkl', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu',
+    'superlu_dist',
+    'mumps',
+    'chaco',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-scalar-type=complex '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-int8.eb b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-int8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8ff3938d0468003b87c601e4b286adc9beb0a061
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020-int8.eb
@@ -0,0 +1,54 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-int8'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with 8-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'gpsmkl', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'hypre',
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu_dist',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-64-bit-indices=1 '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb
index 414bc9f17b0acfde951aadd442d484c4d756ba80..48b295308ab12289e97ed058236414a7070b39aa 100644
--- a/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-gpsmkl-2020.eb
@@ -10,7 +10,7 @@ This version is configured with several downloads of other libraries,
 with --with-large-file-io and no debugging. It is a C and Fortran
 version with default 4-Byte integer values.
 
-For more information see $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/configure.log.
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
 """
 
 site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
@@ -47,7 +47,7 @@ download_deps_static = [
     'parms',
 ]
 
-configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC'
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
 
 postinstallcmds = [
     'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-complex.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-complex.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0073052eda3bae85c34e7842f03ba7535143eb0
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-complex.eb
@@ -0,0 +1,56 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-complex'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with complex numbers only and with default 4-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu',
+    'superlu_dist',
+    'mumps',
+    'chaco',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-scalar-type=complex '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-int8.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-int8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b49b8fcbfc0157ea4ef7ace4f49864e4a620163d
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020-int8.eb
@@ -0,0 +1,54 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-int8'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with 8-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'hypre',
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu_dist',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-64-bit-indices=1 '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb
index 3fd12b03816ec55e3ec3ec8c96672a98cc8a392e..5fbc54325f778b447ddcbaecc65ee720d123f795 100644
--- a/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-2020.eb
@@ -10,7 +10,7 @@ This version is configured with several downloads of other libraries,
 with --with-large-file-io and no debugging. It is a C and Fortran
 version with default 4-Byte integer values.
 
-For more information see $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/configure.log.
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
 """
 
 site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
@@ -47,7 +47,7 @@ download_deps_static = [
     'parms',
 ]
 
-configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC'
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
 
 postinstallcmds = [
     'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-complex.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-complex.eb
new file mode 100644
index 0000000000000000000000000000000000000000..17b28ea1452895296412a711418ee765814500d4
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-complex.eb
@@ -0,0 +1,56 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-complex'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with complex numbers only and with default 4-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel-para', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu',
+    'superlu_dist',
+    'mumps',
+    'chaco',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-scalar-type=complex '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-int8.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-int8.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e1cc4a0b47899180e91a89558e80036c023362d5
--- /dev/null
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020-int8.eb
@@ -0,0 +1,54 @@
+name = "PETSc"
+version = "3.14"
+versionsuffix = '-int8'
+
+homepage = 'http://www.mcs.anl.gov/petsc'
+description = """PETSc, pronounced PET-see (the S is silent), is a suite
+of data structures and routines for the scalable (parallel) solution
+of scientific applications modeled by partial differential equations.
+
+This version is configured with several downloads of other libraries,
+with --with-large-file-io and no debugging. It is a C and Fortran
+version with 8-Byte integer values.
+
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
+"""
+
+site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
+
+toolchain = {'name': 'intel-para', 'version': '2020'}
+
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
+sources = ['petsc-lite-%s.tar.gz' % version]
+
+builddependencies = [
+    ('CMake', '3.18.0')
+]
+dependencies = [
+    ('HDF5', '1.10.6'),
+]
+
+download_deps = [
+    'triangle',
+]
+
+download_deps_static = [
+    'hypre',
+    'metis',
+    'parmetis',
+    'spooles',
+    'superlu_dist',
+]
+
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
+configopts += '--with-64-bit-indices=1 '
+
+postinstallcmds = [
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/seq/aij.h %(installdir)s/include/petsc/private/',
+    'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/dense/seq/dense.h %(installdir)s/include/petsc/private/'
+]
+
+moduleclass = 'numlib'
diff --git a/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020.eb b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020.eb
index 4e4d267f16a35d5f687482412d8402ebda490cf8..93e674d974fe2f6b379685d2405086aee669d950 100644
--- a/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020.eb
+++ b/Golden_Repo/p/PETSc/PETSc-3.14-intel-para-2020.eb
@@ -10,7 +10,7 @@ This version is configured with several downloads of other libraries,
 with --with-large-file-io and no debugging. It is a C and Fortran
 version with default 4-Byte integer values.
 
-For more information see $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/configure.log.
+For more information see $PETSC_DIR/lib/petsc/conf/configure-hash.
 """
 
 site_contacts = 'I. Gutheil (i.gutheil@fz-juelich.de)'
@@ -47,7 +47,7 @@ download_deps_static = [
     'parms',
 ]
 
-configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC'
+configopts = '--with-large-file-io --with-cxx-dialect=C++11 --with-pic=0 -fPIC '
 
 postinstallcmds = [
     'cp %(builddir)s/petsc-%(version)s.0/src/mat/impls/aij/mpi/mpiaij.h %(installdir)s/include/petsc/private/',