diff --git a/earthdiagnostics/datafile.py b/earthdiagnostics/datafile.py
index a21248df673999e0ef194c79d8a8ef0343c7ab6e..9550344727083772d43a7adcfb412f4dcc3356eb 100644
--- a/earthdiagnostics/datafile.py
+++ b/earthdiagnostics/datafile.py
@@ -214,6 +214,8 @@ class DataFile(Publisher):
     def to_storage(cls, remote_file, data_convention):
         """Create a new datafile object for a file that is going to be generated and stored"""
         new_object = cls()
+        if 'cmorfiles' in remote_file:
+            remote_file = remote_file.replace('cmorfiles', 'diags')
         new_object.remote_file = remote_file
         new_object.storage_status = StorageStatus.PENDING
         new_object.data_convention = data_convention
@@ -272,7 +274,7 @@ class DataFile(Publisher):
             return
 
         Log.info('File {0} uploaded!', self.remote_file)
-        self.create_link()
+        # self.create_link()
         self.storage_status = StorageStatus.READY
 
     def set_local_file(self, local_file, diagnostic=None, rename_var='', region=None):