diff --git a/environment.yml b/environment.yml
index 8cf10c56b..86ff4005d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,7 +2,6 @@ name: cadquery
 channels:
   - cadquery
   - conda-forge
-  - defaults
 dependencies:
   - python>=3.8
   - ipython
@@ -23,9 +22,8 @@ dependencies:
   - nlopt
   - path
   - casadi
+  - multimethod >=1.7,<2.0
   - pip
   - pip:
-    - "--install-option=\"--no-deps\""
-    - "--editable=."
-    - sphinxcadquery
-    - multimethod>=1.7,<2.0
+    - --editable=.
+    - git+https://github.com/CadQuery/OCP-stubs.git
diff --git a/setup.py b/setup.py
index 4abadc2cd..24aad036d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,9 +21,10 @@
 is_rtd = "READTHEDOCS" in os.environ
 is_appveyor = "APPVEYOR" in os.environ
 is_azure = "CONDA_PY" in os.environ
+is_conda = "CONDA_PREFIX_1" in os.environ
 
-# Only include the installation dependencies if we are not running on RTD or AppVeyor
-if not is_rtd and not is_appveyor and not is_azure:
+# Only include the installation dependencies if we are not running on RTD or AppVeyor or in a conda env
+if not is_rtd and not is_appveyor and not is_azure and not is_conda:
     reqs = [
         "cadquery-ocp>=7.6,<7.7",
         "ezdxf",