diff --git a/environment.yaml b/environment.yaml
index 7684a3eb..8534f703 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -6,7 +6,7 @@ dependencies:
   - python
   - pip
 
-  - pypsa>=0.14
+  #- pypsa>=0.14  # until pypsa/pypsa#102 closed
 
   # Dependencies of the workflow itself
   - xlrd
@@ -40,6 +40,7 @@ dependencies:
 
   - pip:
     - vresutils>=0.3
+    - git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until pypsa/pypsa#102 closed
     - git+https://github.com/FRESNA/atlite.git#egg=atlite
     - git+https://github.com/PyPSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit