diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ac7afcc..8f75a353 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,9 +16,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Explain `[slurmrestd]` > `version` agent setting is more intended for
     developers and should not be changed.
   - Mention Slurm accounting is required in quickstart guide (#341).
-- conf: Add `ldap`>`user_primary_group_attribute` for the gateway.
-- gateway: Support custom LDAP user primary group attribute.
-- ldap-check: Support custom LDAP user primary group attribute.
+- conf:
+  - Add `ldap`>`user_primary_group_attribute` parameter for the gateway.
+  - Add `ldap`>`group_object_classes` parameter for the gateway.
+- gateway: Support custom LDAP user primary group attribute and group object
+  classes (#342).
+- ldap-check: Support custom LDAP user primary group attribute and group object
+  classes (#342).
 
 ## Changed
 - pkgs: Add requirement on RFL.core >= 1.0.3.
diff --git a/conf/vendor/gateway.yml b/conf/vendor/gateway.yml
index accad4e5..af89d30a 100644
--- a/conf/vendor/gateway.yml
+++ b/conf/vendor/gateway.yml
@@ -142,6 +142,13 @@ ldap:
     type: str
     default: cn
     doc: Group entry attribute for name
+  group_object_classes:
+    type: list
+    content: str
+    default:
+    - posixGroup
+    - groupOfNames
+    doc: List of LDAP object classes for groups
   bind_dn:
     type: str
     doc: |
diff --git a/slurmweb/apps/gateway.py b/slurmweb/apps/gateway.py
index 27486107..f7abbf16 100644
--- a/slurmweb/apps/gateway.py
+++ b/slurmweb/apps/gateway.py
@@ -119,6 +119,7 @@ def __init__(self, seed):
                     user_fullname_attribute=self.settings.ldap.user_fullname_attribute,
                     user_primary_group_attribute=self.settings.ldap.user_primary_group_attribute,
                     group_name_attribute=self.settings.ldap.group_name_attribute,
+                    group_object_classes=self.settings.ldap.group_object_classes,
                     cacert=self.settings.ldap.cacert,
                     starttls=self.settings.ldap.starttls,
                     bind_dn=self.settings.ldap.bind_dn,
diff --git a/slurmweb/apps/ldap.py b/slurmweb/apps/ldap.py
index b88331a0..267b5d38 100644
--- a/slurmweb/apps/ldap.py
+++ b/slurmweb/apps/ldap.py
@@ -30,6 +30,7 @@ def run(self):
             user_fullname_attribute=self.settings.ldap.user_fullname_attribute,
             user_primary_group_attribute=self.settings.ldap.user_primary_group_attribute,
             group_name_attribute=self.settings.ldap.group_name_attribute,
+            group_object_classes=self.settings.ldap.group_object_classes,
             starttls=self.settings.ldap.starttls,
             bind_dn=self.settings.ldap.bind_dn,
             bind_password=self.settings.ldap.bind_password,