diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
index 2b497d0626..0bf7cf61fe 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
@@ -106,10 +106,10 @@ class MayaSubmitRemotePublishDeadline(
         environment["AVALON_ASSET"] = instance.context.data["asset"]
         environment["AVALON_TASK"] = instance.context.data["task"]
         environment["AVALON_APP_NAME"] = os.environ.get("AVALON_APP_NAME")
-        environment["OPENPYPE_USERNAME"] = instance.context.data["user"]
         environment["OPENPYPE_PUBLISH_SUBSET"] = instance.data["subset"]
         environment["OPENPYPE_REMOTE_PUBLISH"] = "1"
         environment["AYON_LOG_NO_COLORS"] = "1"
+        environment["AYON_USERNAME"] = instance.context.data["user"]
         environment["AYON_REMOTE_PUBLISH"] = "1"
 
         for key, value in environment.items():
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
index 42f60f07a6..a90397baa2 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
@@ -69,7 +69,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
         "AVALON_APP_NAME",
-        "OPENPYPE_USERNAME",
+        "AYON_USERNAME",
         "OPENPYPE_SG_USER",
         "KITSU_LOGIN",
         "KITSU_PWD"
@@ -129,7 +129,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             "AVALON_PROJECT": instance.context.data["projectName"],
             "AVALON_ASSET": instance.context.data["asset"],
             "AVALON_TASK": instance.context.data["task"],
-            "OPENPYPE_USERNAME": instance.context.data["user"],
+            "AYON_USERNAME": instance.context.data["user"],
             "AYON_LOG_NO_COLORS": "1",
             "IS_TEST": str(int(is_in_tests())),
             "AYON_PUBLISH_JOB": "1",
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
index cfbff118a5..bd343e103a 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
@@ -111,7 +111,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
         "AVALON_APP_NAME",
-        "OPENPYPE_USERNAME",
+        "AYON_USERNAME",
         "OPENPYPE_SG_USER",
         "KITSU_LOGIN",
         "KITSU_PWD"
@@ -185,7 +185,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "AVALON_PROJECT": instance.context.data["projectName"],
             "AVALON_ASSET": instance.context.data["asset"],
             "AVALON_TASK": instance.context.data["task"],
-            "OPENPYPE_USERNAME": instance.context.data["user"],
+            "AYON_USERNAME": instance.context.data["user"],
             "AYON_LOG_NO_COLORS": "1",
             "IS_TEST": str(int(is_in_tests())),
             "AYON_PUBLISH_JOB": "1",
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
index 40c279d011..680795a329 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
@@ -67,7 +67,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
         "AVALON_APP_NAME",
-        "OPENPYPE_USERNAME",
+        "AYON_USERNAME",
         "OPENPYPE_SG_USER",
     ]
     priority = 50
@@ -186,7 +186,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
             "AVALON_PROJECT": anatomy_data["project"]["name"],
             "AVALON_ASSET": instance.context.data["asset"],
             "AVALON_TASK": anatomy_data["task"]["name"],
-            "OPENPYPE_USERNAME": anatomy_data["user"]
+            "AYON_USERNAME": anatomy_data["user"]
         })
 
         # add environments from self.environ_keys