diff --git a/var/spack/repos/builtin/packages/py-horovod/package.py b/var/spack/repos/builtin/packages/py-horovod/package.py
index ad3b7e4061..0da00e92b3 100644
--- a/var/spack/repos/builtin/packages/py-horovod/package.py
+++ b/var/spack/repos/builtin/packages/py-horovod/package.py
@@ -14,6 +14,10 @@ class PyHorovod(PythonPackage, CudaPackage):
     maintainers = ['adamjstewart', 'aweits', 'tgaddair']
 
     version('master', branch='master', submodules=True)
+    version('0.21.3', tag='v0.21.3', submodules=True)
+    version('0.21.2', tag='v0.21.2', submodules=True)
+    version('0.21.1', tag='v0.21.1', submodules=True)
+    version('0.21.0', tag='v0.21.0', submodules=True)
     version('0.20.3', tag='v0.20.3', submodules=True)
     version('0.20.2', tag='v0.20.2', submodules=True)
     version('0.20.1', tag='v0.20.1', submodules=True)
@@ -65,12 +69,14 @@ class PyHorovod(PythonPackage, CudaPackage):
     depends_on('py-cffi@1.4.0:',        type=('build', 'run'),         when='frameworks=pytorch')
     depends_on('mxnet@1.4.1:+python',   type=('build', 'link', 'run'), when='frameworks=mxnet')
     depends_on('py-keras@2.0.8,2.1.2:', type=('build', 'run'),         when='frameworks=keras')
-    depends_on('py-h5py@2.9:',          type=('build', 'run'),         when='frameworks=spark')
+    depends_on('py-h5py@:2.999',        type=('build', 'run'),         when='frameworks=spark')
     depends_on('py-numpy',              type=('build', 'run'),         when='frameworks=spark')
     depends_on('py-petastorm@0.8.2',    type=('build', 'run'),         when='frameworks=spark @:0.19.1')
-    depends_on('py-petastorm@0.9.0:',   type=('build', 'run'),         when='frameworks=spark @0.19.2:')
+    depends_on('py-petastorm@0.9.0:',   type=('build', 'run'),         when='frameworks=spark @0.19.2:0.21.0')
+    depends_on('py-petastorm@0.9.8:',   type=('build', 'run'),         when='frameworks=spark @0.21.1:')
     depends_on('py-pyarrow@0.15.0:',    type=('build', 'run'),         when='frameworks=spark')
-    depends_on('py-pyspark@2.3.2:',     type=('build', 'run'),         when='frameworks=spark')
+    depends_on('py-pyspark@2.3.2:',     type=('build', 'run'),         when='frameworks=spark ^python@:3.7')
+    depends_on('py-pyspark@3.0.0:',     type=('build', 'run'),         when='frameworks=spark ^python@3.8:')
     depends_on('py-ray',                type=('build', 'run'),         when='frameworks=ray')
 
     # Build dependencies
diff --git a/var/spack/repos/builtin/packages/py-petastorm/package.py b/var/spack/repos/builtin/packages/py-petastorm/package.py
index 8d8f638950..a7dcca0ba1 100644
--- a/var/spack/repos/builtin/packages/py-petastorm/package.py
+++ b/var/spack/repos/builtin/packages/py-petastorm/package.py
@@ -12,9 +12,10 @@ class PyPetastorm(PythonPackage):
     pypi = "petastorm/petastorm-0.8.2.tar.gz"
 
     maintainers = ['adamjstewart']
-
+    version('0.9.8', sha256='66009b7ad3f08b0485a748f12b2095a0d2470e04f0c63de43cd5b099f270c268')
     version('0.8.2', sha256='7782c315e1ee8d15c7741e3eea41e77b9efce661cf58aa0220a801db64f52f91')
 
+    depends_on('python@3:', when='@0.9.8:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
     depends_on('py-dill@0.2.1:', type=('build', 'run'))
     depends_on('py-diskcache@3.0.0:', type=('build', 'run'))
@@ -26,5 +27,6 @@ class PyPetastorm(PythonPackage):
     depends_on('py-psutil@4.0.0:', type=('build', 'run'))
     depends_on('py-pyspark@2.1.0:', type=('build', 'run'))
     depends_on('py-pyzmq@14.0.0:', type=('build', 'run'))
-    depends_on('py-pyarrow@0.12.0:', type=('build', 'run'))
+    depends_on('py-pyarrow@0.12.0:', type=('build', 'run'), when='@:0.8.2')
+    depends_on('py-pyarrow@0.17.1:', type=('build', 'run'), when='@0.9.8:')
     depends_on('py-six@1.5.0:', type=('build', 'run'))