diff --git a/services/workflow/src/workflow/server.py b/services/workflow/src/workflow/server.py
index e91c0e7a862cba460ca313c261e4ff4cb43c4134..4f5f82903f1ae1e3a28c24025b2e37d299e2c95a 100644
--- a/services/workflow/src/workflow/server.py
+++ b/services/workflow/src/workflow/server.py
@@ -117,7 +117,7 @@ class WorkflowFilesRestService:
         Audience: front-end and CLI
         """
         print('Adding a file')
-        file = self.request.info.save_file(request_id=self.request.matchdict['request_id'],
+        file = self.request.info.save_file(request=self.request.context,
                                            filename=self.request.matchdict['filename'],
                                            content=self.request.body)
         return file
@@ -140,7 +140,7 @@ class WorkflowFilesRestService:
         Audience: ???
         :return:
         """
-        self.request.response.body = self.request.context.content
+        self.request.response.body = lookup_file(self.request).content
         return self.request.response
 
     @view_config(request_method='GET', accept='application/json', route_name='workflow_request_file')