diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 0e957b28..570c21f1 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -20,19 +20,19 @@ jobs:
         include:
           - app: frontend
             path: frontend
-            version: 2.0.1
+            version: latest
             experimental: true
           - app: backend
             path: backend
-            version: 2.0.1
+            version: latest
             experimental: true
           - app: orborus
             path: functions/onprem/orborus
-            version: 2.0.1
+            version: latest
             experimental: true
           - app: worker
             path: functions/onprem/worker
-            version: 2.0.1 
+            version: latest
             experimental: true
     steps:
       - name: Checkout
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 8b8fb878..35db256f 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1449,6 +1449,20 @@ func executeWorkflow(resp http.ResponseWriter, request *http.Request) {
 		}
 
 		resp.WriteHeader(200)
+
+		// Check for "wait" query if it's true
+		wait, waitok := request.URL.Query()["wait"]
+		if waitok && wait[0] == "true" {
+			returnBody := shuffle.HandleRetValidation(ctx, workflowExecution, 1)
+			returnBytes, err := json.Marshal(returnBody)
+			if err != nil {
+				log.Printf("[ERROR] Failed to marshal retStruct in single execution: %s", err)
+			}
+
+			resp.Write(returnBytes)
+			return
+		}
+
 		resp.Write([]byte(fmt.Sprintf(`{"success": true, "execution_id": "%s", "authorization": "%s"}`, workflowExecution.ExecutionId, workflowExecution.Authorization)))
 		return
 	}