diff --git a/conf/common/requirements.txt b/conf/common/requirements.txt
index ebf2a6f7..dc5f4286 100644
--- a/conf/common/requirements.txt
+++ b/conf/common/requirements.txt
@@ -12,4 +12,4 @@ termcolor
 terminaltables
 tqdm
 yapf==0.31.0
-git+https://github.com/SymbiFlow/edalize.git@symbiflow_update#egg=edalize
+git+https://github.com/antmicro/edalize.git@uhdm-use-upstream-yosys#egg=edalize
diff --git a/conf/symbiflow/environment.yml b/conf/symbiflow/environment.yml
index 59f900e1..9573bcdb 100644
--- a/conf/symbiflow/environment.yml
+++ b/conf/symbiflow/environment.yml
@@ -3,8 +3,8 @@ channels:
   - defaults
   - litex-hub
 dependencies:
-  - litex-hub::yosys-uhdm=v0.0_93_ga57fae6
   - litex-hub::yosys
+  - litex-hub::symbiflow-yosys-plugins
   - python=3.7
   - pip
   - pip:
diff --git a/toolchains/vivado.py b/toolchains/vivado.py
index d88ff719..d21647e1 100644
--- a/toolchains/vivado.py
+++ b/toolchains/vivado.py
@@ -358,11 +358,3 @@ def __init__(self, rootdir):
             '-iopad', '-arch xc7', '-flatten', 'frontend=surelog'
         ]
         self.toolchain = 'yosys-vivado-uhdm'
-        uhdm_yosys_path = shutil.which("uhdm-yosys")
-        # by default assume, uhdm-yosys is installed in symbiflow env
-        if uhdm_yosys_path is None:
-            print(
-                "Could not find uhdm-yosys binary. Please execute 'source env.sh' or reinstall conda environments."
-            )
-            sys.exit(1)
-        uhdm_yosys_path = os.path.dirname(uhdm_yosys_path)