diff --git a/environment.docs.yaml b/environment.docs.yaml
index 1c60e90a..19c3d224 100755
--- a/environment.docs.yaml
+++ b/environment.docs.yaml
@@ -5,7 +5,7 @@ channels:
 dependencies:
   #- python
   - pip
-  # - pypsa>=0.16 # until PyPSA/a3c0991 released 
+  - pypsa>=0.17 
   - atlite
 
   # Dependencies of the workflow itself
@@ -47,7 +47,6 @@ dependencies:
     - vresutils==0.3.1
     - git+https://github.com/PyPSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
-    - git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until PyPSA/a3c0991 released 
     - cdsapi
     - sphinx
     - sphinx_rtd_theme
diff --git a/environment.yaml b/environment.yaml
index 39e85c49..72da4445 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -8,7 +8,7 @@ dependencies:
   - python
   - pip
 
-  # - pypsa>=0.16 # until PyPSA/a3c0991 released 
+  - pypsa>=0.17 
   - atlite
 
   # Dependencies of the workflow itself
@@ -53,5 +53,4 @@ dependencies:
     - vresutils==0.3.1
     - git+https://github.com/PyPSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
-    - git+https://github.com/PyPSA/pypsa.git#egg=pypsa # until PyPSA/a3c0991 released 
     - cdsapi