diff --git a/var/spack/repos/builtin/packages/py-picmistandard/package.py b/var/spack/repos/builtin/packages/py-picmistandard/package.py
index 6ef9547e6e..7c850b36c1 100644
--- a/var/spack/repos/builtin/packages/py-picmistandard/package.py
+++ b/var/spack/repos/builtin/packages/py-picmistandard/package.py
@@ -10,11 +10,13 @@ class PyPicmistandard(PythonPackage):
     """Standard input format for Particle-In-Cell codes"""
 
     homepage = "https://picmi-standard.github.io"
+    url      = "https://github.com/picmi-standard/picmi/archive/refs/tags/0.0.14.tar.gz"
     git      = "https://github.com/picmi-standard/picmi.git"
 
     maintainers = ['ax3l', 'dpgrote', 'RemiLehe']
 
     version('develop', branch='master')
+    version('0.0.14', sha256='b7eefdae1c43119984226b2df358c86fdeef7495084e47b3575e3d07e790ba30')
 
     depends_on('python@3.6:', type=('build', 'run'))
     depends_on('py-numpy', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-warpx/package.py b/var/spack/repos/builtin/packages/py-warpx/package.py
index bdd92017a5..9d0a9607be 100644
--- a/var/spack/repos/builtin/packages/py-warpx/package.py
+++ b/var/spack/repos/builtin/packages/py-warpx/package.py
@@ -23,7 +23,9 @@ class PyWarpx(PythonPackage):
 
     maintainers = ['ax3l', 'dpgrote', 'RemiLehe']
 
+    # NOTE: if you update the versions here, also see warpx
     version('develop', branch='development')
+    version('21.06', sha256='a26039dc4061da45e779dd5002467c67a533fc08d30841e01e7abb3a890fbe30')
     version('21.05', sha256='f835f0ae6c5702550d23191aa0bb0722f981abb1460410e3d8952bc3d945a9fc')
     version('21.04', sha256='51d2d8b4542eada96216e8b128c0545c4b7527addc2038efebe586c32c4020a0')
 
@@ -36,10 +38,10 @@ class PyWarpx(PythonPackage):
                    type=['build', 'link'])
 
     depends_on('python@3.6:', type=('build', 'run'))
-    depends_on('py-numpy@1.15.0:', type=('build', 'run'))
+    depends_on('py-numpy@1.15.0:1.99.99', type=('build', 'run'))
     depends_on('py-mpi4py@2.0.0:', type=('build', 'run'), when='+mpi')
-    depends_on('py-periodictable@1.5:', type=('build', 'run'))
-    depends_on('py-picmistandard', type=('build', 'run'))
+    depends_on('py-periodictable@1.5:1.99', type=('build', 'run'))
+    depends_on('py-picmistandard@0.0.14', type=('build', 'run'))
     depends_on('py-setuptools@38.6:', type='build')
     depends_on('py-wheel', type='build')
     depends_on('warpx +lib ~mpi +shared', type=('build', 'link'), when='~mpi')
diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py
index 4132f913bf..26c12831db 100644
--- a/var/spack/repos/builtin/packages/warpx/package.py
+++ b/var/spack/repos/builtin/packages/warpx/package.py
@@ -22,6 +22,7 @@ class Warpx(CMakePackage):
 
     maintainers = ['ax3l', 'dpgrote', 'MaxThevenet', 'RemiLehe']
 
+    # NOTE: if you update the versions here, also see py-warpx
     version('develop', branch='development')
     version('21.06', sha256='a26039dc4061da45e779dd5002467c67a533fc08d30841e01e7abb3a890fbe30')
     version('21.05', sha256='f835f0ae6c5702550d23191aa0bb0722f981abb1460410e3d8952bc3d945a9fc')