diff --git a/client-api_python/generated/PySirius/pysirius_sdk.py b/client-api_python/generated/PySirius/pysirius_sdk.py
index 88f9573f..8d6f9463 100644
--- a/client-api_python/generated/PySirius/pysirius_sdk.py
+++ b/client-api_python/generated/PySirius/pysirius_sdk.py
@@ -270,8 +270,8 @@ def start_sirius(self, sirius_path=None, port=None, projectspace=None, workspace
                 return None
             print("\033[93m [WARNING] Overwriting workspace location [NOT RECOMMENDED] \033[0m")
             SiriusSDK.workspace = os.path.abspath(workspace)
-            run_command.insert(3, "--workspace")
-            run_command.insert(4, workspace)
+            run_command.insert(1, "--workspace")
+            run_command.insert(2, workspace)
 
         # check for port
         if port is not None:
diff --git a/client-api_python/pysirius_sdk.py b/client-api_python/pysirius_sdk.py
index 88f9573f..8d6f9463 100644
--- a/client-api_python/pysirius_sdk.py
+++ b/client-api_python/pysirius_sdk.py
@@ -270,8 +270,8 @@ def start_sirius(self, sirius_path=None, port=None, projectspace=None, workspace
                 return None
             print("\033[93m [WARNING] Overwriting workspace location [NOT RECOMMENDED] \033[0m")
             SiriusSDK.workspace = os.path.abspath(workspace)
-            run_command.insert(3, "--workspace")
-            run_command.insert(4, workspace)
+            run_command.insert(1, "--workspace")
+            run_command.insert(2, workspace)
 
         # check for port
         if port is not None:
diff --git a/client-api_r/generated/R/rsirius_sdk.R b/client-api_r/generated/R/rsirius_sdk.R
index e560f871..fe069d10 100644
--- a/client-api_r/generated/R/rsirius_sdk.R
+++ b/client-api_r/generated/R/rsirius_sdk.R
@@ -226,7 +226,7 @@ SiriusSDK <- R6::R6Class(
         }
         cat("[WARNING] Overwriting workspace location [NOT RECOMMENDED]\n")
         self$workspace <- normalizePath(workspace)
-        run_args <- append(run_args, c("--workspace", workspace), 3)
+        run_args <- append(run_args, c("--workspace", workspace), 0)
       }
 
       if (!is.null(port)) {
diff --git a/client-api_r/generated/man/rsirius_api.Rd b/client-api_r/generated/man/rsirius_api.Rd
index 10d0e0a7..99b01b6c 100644
--- a/client-api_r/generated/man/rsirius_api.Rd
+++ b/client-api_r/generated/man/rsirius_api.Rd
@@ -61,6 +61,7 @@ Do not edit the class manually.
 \subsection{Public methods}{
 \itemize{
 \item \href{#method-rsirius_api-new}{\code{rsirius_api$new()}}
+\item \href{#method-rsirius_api-wait_for_job_completion}{\code{rsirius_api$wait_for_job_completion()}}
 \item \href{#method-rsirius_api-clone}{\code{rsirius_api$clone()}}
 }
 }
@@ -80,6 +81,15 @@ Initialize a new RSirius API Class.
 }
 \if{html}{\out{</div>}}
 }
+}
+\if{html}{\out{<hr>}}
+\if{html}{\out{<a id="method-rsirius_api-wait_for_job_completion"></a>}}
+\if{latex}{\out{\hypertarget{method-rsirius_api-wait_for_job_completion}{}}}
+\subsection{Method \code{wait_for_job_completion()}}{
+\subsection{Usage}{
+\if{html}{\out{<div class="r">}}\preformatted{rsirius_api$wait_for_job_completion(project_id, job_id, timeout_in_sec = NULL)}\if{html}{\out{</div>}}
+}
+
 }
 \if{html}{\out{<hr>}}
 \if{html}{\out{<a id="method-rsirius_api-clone"></a>}}
diff --git a/client-api_r/rsirius_sdk.R b/client-api_r/rsirius_sdk.R
index fa7c68c0..92789c8b 100644
--- a/client-api_r/rsirius_sdk.R
+++ b/client-api_r/rsirius_sdk.R
@@ -226,7 +226,7 @@ SiriusSDK <- R6::R6Class(
         }
         cat("[WARNING] Overwriting workspace location [NOT RECOMMENDED]\n")
         self$workspace <- normalizePath(workspace)
-        run_args <- append(run_args, c("--workspace", workspace), 3)
+        run_args <- append(run_args, c("--workspace", workspace), 0)
       }
 
       if (!is.null(port)) {