diff --git a/conductor/conductor/cloud_formation.py b/conductor/conductor/cloud_formation.py
index 991a90d2..a1283553 100644
--- a/conductor/conductor/cloud_formation.py
+++ b/conductor/conductor/cloud_formation.py
@@ -47,7 +47,7 @@ def prepare_user_data(context, hostname, service, unit, template='Default', **kw
             template_data = template_data.replace(
                 '%RESULT_QUEUE%',
                 '-execution-results-{0}'.format(
-                    str(context['/dataSource']['id'])).lower())
+                    str(context['/dataSource']['name'])).lower())
 
             init_script = init_script.replace(
                 '%WINDOWS_AGENT_CONFIG_BASE64%',