diff --git a/src/askem_beaker/contexts/dataset/context.py b/src/askem_beaker/contexts/dataset/context.py
index fe34a62..41a59b2 100644
--- a/src/askem_beaker/contexts/dataset/context.py
+++ b/src/askem_beaker/contexts/dataset/context.py
@@ -254,7 +254,8 @@ async def save_dataset_request(self, message):
                 "id": new_dataset_id,
                 "username": self.auth.username,
                 "password": self.auth.password,
-                "filename": filename
+                "filename": filename,
+                "dataservice_url": dataservice_url
             }
         )
         df_response = await self.execute(code)
diff --git a/src/askem_beaker/contexts/dataset/procedures/python3/hmi_create_csv_dataset.py b/src/askem_beaker/contexts/dataset/procedures/python3/hmi_create_csv_dataset.py
index fb6b66e..2b49406 100644
--- a/src/askem_beaker/contexts/dataset/procedures/python3/hmi_create_csv_dataset.py
+++ b/src/askem_beaker/contexts/dataset/procedures/python3/hmi_create_csv_dataset.py
@@ -7,8 +7,8 @@
 with tempfile.TemporaryFile() as temp_csv_file:
     {{ var_name|default("df") }}.to_csv(temp_csv_file, index=False, header=True)
     temp_csv_file.seek(0)
-    # Get the HMI_SERVER endpoint and auth token from the environment variable
-    hmi_server = os.getenv('HMI_SERVER_URL')
+    # Set the HMI_SERVER endpoint
+    hmi_server = "{{dataservice_url}}"
 
     # Define the id and filename dynamically
     id = "{{id}}"