diff --git a/.readthedocs.yml b/.readthedocs.yml
index c83de699..301e4829 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,4 +1,4 @@
 version: 2
 
 conda:
-    environment: environment_docs.yaml
\ No newline at end of file
+    environment: environment.docs.yaml
\ No newline at end of file
diff --git a/environment_docs.yaml b/environment.docs.yaml
similarity index 80%
rename from environment_docs.yaml
rename to environment.docs.yaml
index b2999020..2c04770c 100644
--- a/environment_docs.yaml
+++ b/environment.docs.yaml
@@ -39,9 +39,10 @@ dependencies:
   # The FRESNA/KIT stuff is not packaged for conda yet
   - pip:
     - vresutils>=0.2.5
-    - git+https://github.com/FRESNA/atlite.git#egg=atlite
-    - git+https://github.com/PyPSA/glaes.git#egg=glaes
+    - cdsapi
+    - powerplantmatching
+    - git+https://github.com/PyPSA/atlite.git#egg=atlite
+    - git+https://github.com/FZJ-IEK3-VSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
-    - git+https://github.com/FRESNA/powerplantmatching.git#egg=powerplantmatching
     - sphinx
     - sphinx_rtd_theme
\ No newline at end of file
diff --git a/environment.yaml b/environment.yaml
index d5b46a24..12f52935 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -37,10 +37,10 @@ dependencies:
   - conda-forge::shapely
   - conda-forge::libgdal
 
-  # The FRESNA/KIT stuff is not packaged for conda yet
   - pip:
     - vresutils>=0.2.5
-    - git+https://github.com/FRESNA/atlite.git#egg=atlite
-    - git+https://github.com/PyPSA/glaes.git#egg=glaes
+    - cdsapi
+    - powerplantmatching
+    - git+https://github.com/PyPSA/atlite.git#egg=atlite
+    - git+https://github.com/FZJ-IEK3-VSA/glaes.git#egg=glaes
     - git+https://github.com/PyPSA/geokit.git#egg=geokit
-    #- git+https://github.com/FRESNA/powerplantmatching.git#egg=powerplantmatching