diff --git a/scripts/elab.py b/scripts/elab.py
index 0981169..79b1441 100644
--- a/scripts/elab.py
+++ b/scripts/elab.py
@@ -21,10 +21,11 @@ def runDesign(topDef: str, arch: str, lib: str, std: str):
     libPath = os.path.join(os.getcwd(), lib)
     wavePath = os.path.join(os.getcwd(), "wave")
     command = [ ## may add -v for verbose
-        "ghdl", "-r", f"{topDef}", f"{arch}", 
-        f"--wave=../wave/{topDef}-{arch}.ghw" ##, "--read-wave-opt=<See"
+        "ghdl", "--elab-run", f"--workdir={lib}", f"--work={lib}", f"--std={std}",
+        "-o", f"{lib}/{topDef}-{arch}", f"{topDef}", f"{arch}", 
+        f"--wave=wave/{topDef}-{arch}.ghw" ##, "--read-wave-opt=<See"
             ]
-    subprocess.run(command, cwd=libPath)
+    subprocess.run(command)
     command = [
         "gtkwave", f"{topDef}-{arch}.ghw", "--rcvar", 
         "do_initial_zoom_fit yes"]
diff --git a/scripts/ghdl b/scripts/ghdl
index 6d98a77..cb3df0c 100755
--- a/scripts/ghdl
+++ b/scripts/ghdl
@@ -1,3 +1,4 @@
 #!/bin/bash
-
-docker run -t -v /$(pwd):/src -w /src ghdl/ghdl:5.0.0-dev-gcc-ubuntu-24.04 bash -c "ghdl $@"
+VARS="$@"
+COMMAND="ghdl $VARS"
+docker run -it -v .:/src -w /src ghdl/ghdl:5.0.0-dev-gcc-ubuntu-24.04 bash -c "$COMMAND"