diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py
index ac3942380..99f40f49d 100644
--- a/tripleoclient/workflows/deployment.py
+++ b/tripleoclient/workflows/deployment.py
@@ -110,13 +110,13 @@ def create_overcloudrc(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.deployment.v1.create_overcloudrc',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.deployment.v1.create_overcloudrc',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution):
             # the workflow will return the overcloudrc data, an error message
             # or blank.
@@ -276,13 +276,13 @@ def config_download_export(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.deployment.v1.config_download_export',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.deployment.v1.config_download_export',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution,
                                               _WORKFLOW_TIMEOUT):
             if 'message' in payload:
@@ -318,13 +318,13 @@ def get_deployment_status(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.deployment.v1.get_deployment_status',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.deployment.v1.get_deployment_status',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution,
                                               _WORKFLOW_TIMEOUT):
             if 'message' in payload:
@@ -342,13 +342,13 @@ def get_deployment_failures(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.deployment.v1.get_deployment_failures',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.deployment.v1.get_deployment_failures',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution,
                                               _WORKFLOW_TIMEOUT):
             if 'message' in payload:
diff --git a/tripleoclient/workflows/plan_management.py b/tripleoclient/workflows/plan_management.py
index 91aac745f..cb14ec452 100644
--- a/tripleoclient/workflows/plan_management.py
+++ b/tripleoclient/workflows/plan_management.py
@@ -92,13 +92,13 @@ def delete_deployment_plan(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.plan_management.v1.delete_deployment_plan',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.plan_management.v1.delete_deployment_plan',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution,
                                               _WORKFLOW_TIMEOUT):
             if 'message' in payload:
@@ -308,13 +308,13 @@ def export_deployment_plan(clients, **workflow_input):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.plan_management.v1.export_deployment_plan',
-        workflow_input=workflow_input
-    )
-
     with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.plan_management.v1.export_deployment_plan',
+            workflow_input=workflow_input
+        )
+
         for payload in base.wait_for_messages(workflow_client, ws, execution,
                                               _WORKFLOW_TIMEOUT):
             if 'message' in payload:
diff --git a/tripleoclient/workflows/support.py b/tripleoclient/workflows/support.py
index e8b7f2009..2f9dab342 100644
--- a/tripleoclient/workflows/support.py
+++ b/tripleoclient/workflows/support.py
@@ -83,23 +83,23 @@ def fetch_logs(clients, container, server_name, timeout=None,
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.support.v1.fetch_logs',
-        workflow_input=workflow_input
-    )
+    with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.support.v1.fetch_logs',
+            workflow_input=workflow_input
+        )
 
-    websocket = tripleoclients.messaging_websocket()
-    messages = base.wait_for_messages(workflow_client,
-                                      websocket,
-                                      execution,
-                                      timeout)
+        messages = base.wait_for_messages(workflow_client,
+                                          ws,
+                                          execution,
+                                          timeout)
 
-    for message in messages:
-        if message['status'] != 'SUCCESS':
-            raise LogFetchError(message['message'])
-        if message['message']:
-            print('{}'.format(message['message']))
+        for message in messages:
+            if message['status'] != 'SUCCESS':
+                raise LogFetchError(message['message'])
+            if message['message']:
+                print('{}'.format(message['message']))
 
 
 def delete_container(clients, container, timeout=None, concurrency=None):
@@ -122,20 +122,20 @@ def delete_container(clients, container, timeout=None, concurrency=None):
     workflow_client = clients.workflow_engine
     tripleoclients = clients.tripleoclient
 
-    execution = base.start_workflow(
-        workflow_client,
-        'tripleo.support.v1.delete_container',
-        workflow_input=workflow_input
-    )
+    with tripleoclients.messaging_websocket() as ws:
+        execution = base.start_workflow(
+            workflow_client,
+            'tripleo.support.v1.delete_container',
+            workflow_input=workflow_input
+        )
 
-    websocket = tripleoclients.messaging_websocket()
-    messages = base.wait_for_messages(workflow_client,
-                                      websocket,
-                                      execution,
-                                      timeout)
+        messages = base.wait_for_messages(workflow_client,
+                                          ws,
+                                          execution,
+                                          timeout)
 
-    for message in messages:
-        if message['status'] != 'SUCCESS':
-            raise ContainerDeleteFailed(message['message'])
-        if message['message']:
-            print('{}'.format(message['message']))
+        for message in messages:
+            if message['status'] != 'SUCCESS':
+                raise ContainerDeleteFailed(message['message'])
+            if message['message']:
+                print('{}'.format(message['message']))