diff --git a/patchwork/steps/CallSQL/CallSQL.py b/patchwork/steps/CallSQL/CallSQL.py
index 502c76fa0..dca37c5d4 100644
--- a/patchwork/steps/CallSQL/CallSQL.py
+++ b/patchwork/steps/CallSQL/CallSQL.py
@@ -46,7 +46,7 @@ def run(self) -> dict:
         try:
             rv = []
             with self.engine.begin() as conn:
-                cursor = conn.execute(text(self.query))
+                cursor = conn.exec_driver_sql(self.query)
                 for row in cursor:
                     result = row._asdict()
                     rv.append(result)
diff --git a/patchwork/steps/CallShell/CallShell.py b/patchwork/steps/CallShell/CallShell.py
index d738706e6..f5f51d52a 100644
--- a/patchwork/steps/CallShell/CallShell.py
+++ b/patchwork/steps/CallShell/CallShell.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import shlex
 import subprocess
 from pathlib import Path
@@ -7,6 +8,7 @@
 from patchwork.common.utils.utils import mustache_render
 from patchwork.logger import logger
 from patchwork.step import Step, StepStatus
+from patchwork.steps import CallSQL
 from patchwork.steps.CallShell.typed import CallShellInputs, CallShellOutputs
 
 
@@ -24,7 +26,7 @@ def __parse_env_text(env_text: str) -> dict[str, str]:
         env_spliter.whitespace_split = True
         env_spliter.whitespace += ";"
 
-        env: dict[str, str] = dict()
+        env: dict[str, str] = os.environ.copy()
         for env_assign in env_spliter:
             env_assign_spliter = shlex.shlex(env_assign, posix=True)
             env_assign_spliter.whitespace_split = True
diff --git a/pyproject.toml b/pyproject.toml
index fa687fe0f..284311602 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "patchwork-cli"
-version = "0.0.92"
+version = "0.0.93"
 description = ""
 authors = ["patched.codes"]
 license = "AGPL"