diff --git a/openpype/hosts/maya/api/lib_rendersettings.py b/openpype/hosts/maya/api/lib_rendersettings.py
index d9b79e3c2f..5161141ef9 100644
--- a/openpype/hosts/maya/api/lib_rendersettings.py
+++ b/openpype/hosts/maya/api/lib_rendersettings.py
@@ -95,6 +95,7 @@ class RenderSettings(object):
 
         if renderer == "redshift":
             self._set_redshift_settings(width, height)
+            mel.eval("redshiftUpdateActiveAovList")
 
     def _set_arnold_settings(self, width, height):
         """Sets settings for Arnold."""
@@ -158,7 +159,10 @@ class RenderSettings(object):
                     cmds.delete(aov)
 
         redshift_aovs = redshift_render_presets["aov_list"]
+        # list all the aovs
+        all_rs_aovs = cmds.ls(type='RedshiftAOV')
         for rs_aov in redshift_aovs:
+            rs_layername = rs_aov
             if " " in rs_aov:
                 rs_renderlayer = rs_aov.replace(" ", "")
                 rs_layername = "rsAov_{}".format(rs_renderlayer)
@@ -170,6 +174,23 @@ class RenderSettings(object):
         # update the AOV list
         mel.eval("redshiftUpdateActiveAovList")
 
+        rs_p_engine = redshift_render_presets["primary_gi_engine"]
+        rs_s_engine = redshift_render_presets["secondary_gi_engine"]
+
+        if int(rs_p_engine) or int(rs_s_engine) != 0:
+            cmds.setAttr("redshiftOptions.GIEnabled", 1)
+            if int(rs_p_engine) == 0:
+                # reset the primary GI Engine as default
+                cmds.setAttr("redshiftOptions.primaryGIEngine", 4)
+            if int(rs_s_engine) == 0:
+                # reset the secondary GI Engine as default
+                cmds.setAttr("redshiftOptions.secondaryGIEngine", 2)
+        else:
+            cmds.setAttr("redshiftOptions.GIEnabled", 0)
+
+        cmds.setAttr("redshiftOptions.primaryGIEngine", int(rs_p_engine))
+        cmds.setAttr("redshiftOptions.secondaryGIEngine", int(rs_s_engine))
+
         additional_options = redshift_render_presets["additional_options"]
         ext = redshift_render_presets["image_format"]
         img_exts = ["iff", "exr", "tif", "png", "tga", "jpg"]
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_render_settings.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_render_settings.json
index 512e45f674..e90495891b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_render_settings.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_render_settings.json
@@ -317,9 +317,8 @@
                   "defaults": "0",
                   "enum_items": [
                     {"0":  "None"},
-                    {"1":  "Photon Map"},
-                    {"2":  "Irradiance Cache"},
-                    {"3":  "Brute Force"}
+                    {"3":  "Irradiance Cache"},
+                    {"4":  "Brute Force"}
                   ]
               },
               {
@@ -330,9 +329,8 @@
                   "defaults": "0",
                   "enum_items": [
                     {"0":  "None"},
-                    {"1":  "Photon Map"},
-                    {"2":  "Irradiance Cache"},
-                    {"3":  "Brute Force"}
+                    {"2": "Irradiance Point Cloud"},
+                    {"4":  "Brute Force"}
                   ]
               },
               {