diff --git a/Makefile b/Makefile
index c573fc3b47..a2f6b3fed2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@
 #
 ################################################################################
 
+CC=gcc
+CXX=g++
+
 .PHONY : all minimal main solver check pycheck arkane clean install decython documentation test q2dtor
 
 all: pycheck main solver check
diff --git a/environment.yml b/environment.yml
index 64df68a1c2..48a4da34a3 100644
--- a/environment.yml
+++ b/environment.yml
@@ -81,13 +81,13 @@ dependencies:
   - conda-forge::gprof2dot
   - conda-forge::numdifftools
   - conda-forge::quantities
+  - conda-forge::muq
+  - conda-forge::lpsolve55
+  - conda-forge::ringdecomposerlib-python
 
 # packages we maintain
-  - rmg::lpsolve55
-  - rmg::muq2
   - rmg::pydas >=1.0.3
   - rmg::pydqed >=1.0.3
-  - rmg::pyrdl
   - rmg::pyrms
   - rmg::symmetry