diff --git a/openpype/hosts/flame/plugins/publish/extract_subset_resources.py b/openpype/hosts/flame/plugins/publish/extract_subset_resources.py
index c6148162a6..5082217db0 100644
--- a/openpype/hosts/flame/plugins/publish/extract_subset_resources.py
+++ b/openpype/hosts/flame/plugins/publish/extract_subset_resources.py
@@ -143,6 +143,9 @@ class ExtractSubsetResources(publish.Extractor):
         # create staging dir path
         staging_dir = self.staging_dir(instance)
 
+        # append staging dir for later cleanup
+        instance.context.data["cleanupFullPaths"].append(staging_dir)
+
         # add default preset type for thumbnail and reviewable video
         # update them with settings and override in case the same
         # are found in there
diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index cc4304cebd..a32b076775 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -616,7 +616,7 @@ def get_instance_staging_dir(instance):
     First check if 'stagingDir' is already set in instance data.
     In case there already is new tempdir will not be created.
 
-    It also supports `OPENPYPE_TEMP_DIR`, so studio can define own temp
+    It also supports `OPENPYPE_TMPDIR`, so studio can define own temp
     shared repository per project or even per more granular context.
     Template formating is supported also with optional keys. Folder is
     created in case it doesnt exists.
@@ -645,17 +645,16 @@ def get_instance_staging_dir(instance):
     if staging_dir:
         return staging_dir
 
-    openpype_temp_dir = os.getenv("OPENPYPE_TEMP_DIR")
+    openpype_temp_dir = os.getenv("OPENPYPE_TMPDIR")
     custom_temp_dir = None
     if openpype_temp_dir:
         if "{" in openpype_temp_dir:
-            custom_temp_dir = _formated_staging_dir(
+            custom_temp_dir = _format_staging_dir(
                 instance, openpype_temp_dir
             )
         elif os.path.exists(openpype_temp_dir):
             custom_temp_dir = openpype_temp_dir
 
-
     if custom_temp_dir:
         staging_dir = os.path.normpath(
             tempfile.mkdtemp(
@@ -669,30 +668,39 @@ def get_instance_staging_dir(instance):
         )
     instance.data['stagingDir'] = staging_dir
 
-    instance.context.data["cleanupFullPaths"].append(staging_dir)
-
     return staging_dir
 
 
-def _formated_staging_dir(instance, openpype_temp_dir):
+def _format_staging_dir(instance, openpype_temp_dir):
+    """ Formating template
+
+    Template path formatting is supporting:
+    - optional key formating
+    - available keys:
+        - root[work | <root name key>]
+        - project[name | code]
+        - asset
+        - hierarchy
+        - task
+        - username
+        - app
+
+    Args:
+        instance (pyblish.Instance): instance object
+        openpype_temp_dir (str): path string
+
+    Returns:
+        str: formated path
+    """
     anatomy = instance.context.data["anatomy"]
     # get anatomy formating data
     # so template formating is supported
     anatomy_data = copy.deepcopy(instance.context.data["anatomyData"])
     anatomy_data["root"] = anatomy.roots
-    """Template path formatting is supporting:
-            - optional key formating
-            - available keys:
-                - root[work | <root name key>]
-                - project[name | code]
-                - asset
-                - hierarchy
-                - task
-                - username
-                - app
-            """
-    result = StringTemplate.format_template(openpype_temp_dir, anatomy_data)
-    result = os.path.normpath(result)
-            # create the dir in case it doesnt exists
+
+    result = StringTemplate.format_template(
+        openpype_temp_dir, anatomy_data).normalized()
+
+    # create the dir in case it doesnt exists
     os.makedirs(os.path.dirname(result))
     return result