diff --git a/.gitea/workflows/dfi.bash b/.gitea/workflows/dfi.bash
index 4f6e5f3..46c479f 100755
--- a/.gitea/workflows/dfi.bash
+++ b/.gitea/workflows/dfi.bash
@@ -702,18 +702,18 @@ function container::finance::root()
   "${ci_shell[@]}" "$_exec '$_root macros/repo/test/unit.C' $_exit"
   "${ci_shell[@]}" "$_exec '$_root macros/repo/test/unit.C Pluggable\*:Macro\*:Plugin\*' $_exit"
 
-  "${ci_shell[@]}" "$_exec '$_root macros/repo/web/server.C gSystem-\>Exit\(0\)\;'"
+  "${ci_shell[@]}" "$_exec '$_root macros/repo/web/server.C dfi::common::exit\(0,\\\\\\\"Server\\\\\\\"\)\;'"
   # TODO: ^ return value of macro
 
   #
   # Plugins
   #
 
-  "${ci_shell[@]}" "$_exec '$_root plugins/repo/example/example.cc dfi::plugin::example::MyExamples\\ my\;my.example1\(\)\;gSystem-\>Exit\(0\)\;'"
+  "${ci_shell[@]}" "$_exec '$_root plugins/repo/example/example.cc dfi::plugin::example::MyExamples\\ my\;my.example1\(\)\;dfi::common::exit\(0,\\\\\\\"MyExamples\\\\\\\"\)\;'"
 
   # WARNING: bitcoin plugin requires dfi client-side bitcoin plugin
   # and must run *AFTER* the above client::finance::plugins() test
-  "${ci_shell[@]}" "$_exec '$_root plugins/repo/bitcoin/bitcoin.cc try{dfi::macro::load\(\\\\\\\"repo/test/unit.C\\\\\\\"\)\;}catch\(...\){gSystem-\>Exit\(1\)\;}gSystem-\>Exit\(0\)\;' $_exit"
+  "${ci_shell[@]}" "$_exec '$_root plugins/repo/bitcoin/bitcoin.cc try{dfi::macro::load\(\\\\\\\"repo/test/unit.C\\\\\\\"\)\;}catch\(...\){dfi::common::exit\(1\)\;}dfi::common::exit\(0\)\;' $_exit"
   client::finance::down
 }