diff --git a/application/src/main/resources/application.properties b/application/src/main/resources/application.properties
index 86023c94100801bbe4e3ab5d2d3f35c1142b30f4..eceaf67a596c60363e9427c8c26944d6af8fb222 100644
--- a/application/src/main/resources/application.properties
+++ b/application/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 quarkus.log.level=INFO
-quarkus.http.port=8090
+quarkus.http.port=8093
 quarkus.http.cors=false
 quarkus.cache.caffeine."default".expire-after-write=30M
 quarkus.cache.caffeine."ttl".expire-after-write=${quarkus.cache.caffeine."default".expire-after-write}
diff --git a/docker-compose.yml b/docker-compose.yml
index 348080bd77ee5fbb8a9433be0374d498564fd50c..3c3db2e634e5cc3f7aa4909c7749589bb2e2dd4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
       context: ./portal/
       dockerfile: ./src/main/docker/Dockerfile.jvm
     ports:
-      - 8092:8090
+      - 8092:8092
     environment:
       - VIRTUAL_HOST=api.rem.docker
       - CONFIG_SECRET_PATH=/var/run/secrets/secret.properties
@@ -57,7 +57,7 @@ services:
       context: ./application/
       dockerfile: ./src/main/docker/Dockerfile.jvm
     ports:
-      - 8093:8090
+      - 8093:8093
     environment:
       - VIRTUAL_HOST=api.rem.docker
       - CONFIG_SECRET_PATH=/var/run/secrets/secret.properties
diff --git a/pom.xml b/pom.xml
index 10b7c063a6cc9690ea1bdf43927b5cf1bfda0096..4114d6bbd262b8fba3147e21f33049760906c114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,12 +130,10 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>${auto-value.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
diff --git a/portal/pom.xml b/portal/pom.xml
index 1e7a9f5b5b6f895a7d019bb0d68958a27e3763b6..e8b127c1169d5c7436449f8cd10cfbbaa9afcfc8 100644
--- a/portal/pom.xml
+++ b/portal/pom.xml
@@ -10,10 +10,32 @@
   </parent>
   <properties></properties>
   <dependencies>
-  	<dependency>
-  		<groupId>org.imgscalr</groupId>
-  		<artifactId>imgscalr-lib</artifactId>
-  		<version>4.2</version>
-  	</dependency>
+    <dependency>
+      <groupId>org.imgscalr</groupId>
+      <artifactId>imgscalr-lib</artifactId>
+      <version>4.2</version>
+    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler-plugin.version}</version>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.auto.value</groupId>
+              <artifactId>auto-value</artifactId>
+              <version>${auto-value.version}</version>
+            </path>
+            <path>
+              <groupId>org.mapstruct</groupId>
+              <artifactId>mapstruct-processor</artifactId>
+              <version>${org.mapstruct.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/portal/src/main/java/org/eclipsefoundation/api/OrganizationAPI.java b/portal/src/main/java/org/eclipsefoundation/api/OrganizationAPI.java
index e3b80046e58247e221bbf9ce2d5be2c74c134f71..fce17fd8682c56cf0184923f53f38a6bd223705f 100644
--- a/portal/src/main/java/org/eclipsefoundation/api/OrganizationAPI.java
+++ b/portal/src/main/java/org/eclipsefoundation/api/OrganizationAPI.java
@@ -1,5 +1,6 @@
 package org.eclipsefoundation.api;
 
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Nullable;
@@ -165,6 +166,8 @@ public interface OrganizationAPI {
          * @return a bean mapping with values populated from the current request
          */
         public static Builder populateFromWrap(RequestWrapper w) {
+            // default levels for membership calls
+            List<String> levels = w.getParams(FoundationDBParameterNames.LEVELS);
             return builder().setPersonID(w.getFirstParam(FoundationDBParameterNames.USER_NAME).orElseGet(() -> null))
                     .setOrganizationID(
                             w.getFirstParam(FoundationDBParameterNames.ORGANIZATION_ID).orElseGet(() -> null))
@@ -172,7 +175,7 @@ public interface OrganizationAPI {
                     .setEmail(w.getFirstParam(FoundationDBParameterNames.EMAIL).orElseGet(() -> null))
                     .setWorkingGroup(w.getFirstParam(FoundationDBParameterNames.WORKING_GROUP).orElseGet(() -> null))
                     .setDocumentIds(w.getParams(FoundationDBParameterNames.DOCUMENT_IDS))
-                    .setLevels(w.getParams(FoundationDBParameterNames.LEVELS))
+                    .setLevels(levels != null && !levels.isEmpty() ? levels : Arrays.asList("SD", "AP", "AS", "OHAP"))
                     .setIds(w.getParams(DefaultUrlParameterNames.IDS));
         }
 
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequestData.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequestData.java
new file mode 100644
index 0000000000000000000000000000000000000000..9cfe810b304c5fcd8ed3258e86a64891e2830517
--- /dev/null
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequestData.java
@@ -0,0 +1,32 @@
+package org.eclipsefoundation.membership.portal.model;
+
+import org.eclipsefoundation.api.model.PeopleData;
+import org.eclipsefoundation.membership.portal.request.model.ContactRemovalRequest;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+@JsonDeserialize(builder = AutoValue_ContactRemovalRequestData.Builder.class)
+public abstract class ContactRemovalRequestData {
+
+    public abstract PeopleData getPerson();
+    public abstract MemberOrganization getOrganization();
+    public abstract String getReason();
+    public abstract ContactRemovalRequest getRawRequest();
+    
+    public static Builder builder() {
+        return new AutoValue_ContactRemovalRequestData.Builder();
+    }
+
+    @AutoValue.Builder
+    @JsonPOJOBuilder(withPrefix = "set")
+    public static abstract class Builder {
+        public abstract Builder setPerson(PeopleData person);
+        public abstract Builder setOrganization(MemberOrganization organization);
+        public abstract Builder setReason(String reason);
+        public abstract Builder setRawRequest(ContactRemovalRequest rawRequest);
+        public abstract ContactRemovalRequestData build();
+    }
+}
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/WorkingGroupMap.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/model/WorkingGroupMap.java
index 2c78f5bf8ee7fbdd6518b29eed83c7f3dca67d2c..ea534489516fe73d566d0fe918e25fc07f7e4990 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/WorkingGroupMap.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/model/WorkingGroupMap.java
@@ -56,6 +56,8 @@ public abstract class WorkingGroupMap {
 
         public abstract String getDescription();
 
+        public abstract String getParentOrganization();
+
         public abstract WorkingGroupResources getResources();
 
         public abstract List<WorkingGroupParticipationLevel> getLevels();
@@ -77,6 +79,8 @@ public abstract class WorkingGroupMap {
 
             public abstract Builder setDescription(String description);
 
+            public abstract Builder setParentOrganization(String parentOrganization);
+
             public abstract Builder setResources(WorkingGroupResources resources);
 
             public abstract Builder setLevels(List<WorkingGroupParticipationLevel> levels);
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequest.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/ContactRemovalRequest.java
similarity index 93%
rename from portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequest.java
rename to portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/ContactRemovalRequest.java
index 75724eba643109fb64bdf51aff4d9308a23f7ae0..0c4838293a0196c62f80bb6431bb066280c4cf61 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/ContactRemovalRequest.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/ContactRemovalRequest.java
@@ -1,4 +1,4 @@
-package org.eclipsefoundation.membership.portal.model;
+package org.eclipsefoundation.membership.portal.request.model;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationInfoUpdateRequest.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationInfoUpdateRequest.java
similarity index 93%
rename from portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationInfoUpdateRequest.java
rename to portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationInfoUpdateRequest.java
index 39a1b2d930cbc66a8fa144e3855b94802ffa86b4..6b2493c300dcc914525ed0201d1e00517a58fe4c 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationInfoUpdateRequest.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationInfoUpdateRequest.java
@@ -1,4 +1,4 @@
-package org.eclipsefoundation.membership.portal.model;
+package org.eclipsefoundation.membership.portal.request.model;
 
 import javax.annotation.Nullable;
 
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationLogoUpdateRequest.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationLogoUpdateRequest.java
similarity index 83%
rename from portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationLogoUpdateRequest.java
rename to portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationLogoUpdateRequest.java
index f1bdf857bd59a317dea534fa7697275dcbfae9b8..1e2dad64880e4392822ebd3bf563356ffbfab630 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/model/OrganizationLogoUpdateRequest.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/request/model/OrganizationLogoUpdateRequest.java
@@ -1,4 +1,4 @@
-package org.eclipsefoundation.membership.portal.model;
+package org.eclipsefoundation.membership.portal.request.model;
 
 import javax.annotation.Nonnull;
 import javax.ws.rs.FormParam;
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationContactsResource.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationContactsResource.java
index 48a075e6fb1abb5d60a1864c57723f95eccfc293..5c97a3770e02caaee151dd46d0d9b2c700c44f90 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationContactsResource.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationContactsResource.java
@@ -25,13 +25,17 @@ import javax.ws.rs.core.Response;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.eclipsefoundation.api.SysAPI;
+import org.eclipsefoundation.api.PeopleAPI.PeopleRequestParams;
 import org.eclipsefoundation.api.model.OrganizationContactData;
+import org.eclipsefoundation.api.model.PeopleData;
 import org.eclipsefoundation.api.model.SysRelationData;
 import org.eclipsefoundation.core.namespace.RequestHeaderNames;
-import org.eclipsefoundation.membership.portal.model.ContactRemovalRequest;
+import org.eclipsefoundation.membership.portal.model.ContactRemovalRequestData;
 import org.eclipsefoundation.membership.portal.model.EnhancedPersonData;
+import org.eclipsefoundation.membership.portal.model.MemberOrganization;
 import org.eclipsefoundation.membership.portal.namespace.OrganizationalUserType;
 import org.eclipsefoundation.membership.portal.request.RolesAllowed;
+import org.eclipsefoundation.membership.portal.request.model.ContactRemovalRequest;
 import org.eclipsefoundation.membership.portal.service.MailerService;
 import org.jboss.resteasy.specimpl.MultivaluedMapImpl;
 
@@ -96,9 +100,10 @@ public class OrganizationContactsResource extends AbstractRESTResource {
             throw new BadRequestException(
                     "The organization that is being updated should match the organization in the URL");
         }
+        ContactRemovalRequestData data = buildRemovalRequestData(request);
         // fire an email request to remove user from organization
         mailer.sendContactRemovalRequest(request);
-        mailer.sendContactRemovalNotification(request);
+        mailer.sendContactRemovalNotification(data);
         return Response.ok().build();
     }
 
@@ -202,4 +207,32 @@ public class OrganizationContactsResource extends AbstractRESTResource {
         }
         return relations.get().stream().anyMatch(r -> r.getRelation().equalsIgnoreCase(relation));
     }
+
+    /**
+     * Supplements a removal request with more data about the organization and person that should be acted on for the
+     * notifications that are sent out by the system for a removal request.
+     * 
+     * @param r the removal request to retrieve more contextual information for
+     * @return a processed removal request with more contextual data on the org and person involved in the transaction.
+     * @throws BadRequestException if either the organization ID or username do not translate to a real entity, then
+     * this is thrown as the state cannot be recovered.
+     */
+    private ContactRemovalRequestData buildRemovalRequestData(ContactRemovalRequest r) {
+        // should be cached by service, should always have a result
+        Optional<MemberOrganization> org = orgService.getByID(Integer.toString(r.getOrganizationId()));
+        if (org.isEmpty()) {
+            throw new BadRequestException("The passed username is not a valid username");
+        }
+        // get cached people. Should only return one entry as usernames should be unique keys
+        Optional<List<PeopleData>> people = cache.get(r.getUsername(), new MultivaluedMapImpl<>(), PeopleData.class,
+                () -> middle.getAll(
+                        p -> peopleAPI.getPeople(p, PeopleRequestParams.builder().setUsername(r.getUsername()).build()),
+                        PeopleData.class));
+        if (people.isEmpty()) {
+            throw new BadRequestException("The passed username is not a valid username");
+        }
+        // create the output object, including the passed reason.
+        return ContactRemovalRequestData.builder().setOrganization(org.get()).setPerson(people.get().get(0))
+                .setReason(r.getReason()).setRawRequest(r).build();
+    }
 }
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationResource.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationResource.java
index a2d8f9aeed1d3589212b8448bcdb8d340785fecb..f589b10b26691f5946d9cf7a3657c1fef1c36845 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationResource.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/OrganizationResource.java
@@ -59,8 +59,6 @@ import org.eclipsefoundation.membership.portal.helper.ImageFileHelper;
 import org.eclipsefoundation.membership.portal.model.EnhancedPersonData;
 import org.eclipsefoundation.membership.portal.model.MemberOrganization;
 import org.eclipsefoundation.membership.portal.model.OrganizationActivity;
-import org.eclipsefoundation.membership.portal.model.OrganizationInfoUpdateRequest;
-import org.eclipsefoundation.membership.portal.model.OrganizationLogoUpdateRequest;
 import org.eclipsefoundation.membership.portal.model.OrganizationProductData;
 import org.eclipsefoundation.membership.portal.model.OrganizationYearlyActivity;
 import org.eclipsefoundation.membership.portal.model.WorkingGroupMap.WorkingGroup;
@@ -68,6 +66,8 @@ import org.eclipsefoundation.membership.portal.model.mappers.OrganizationProduct
 import org.eclipsefoundation.membership.portal.namespace.ImageStoreFormat;
 import org.eclipsefoundation.membership.portal.namespace.ImageStoreFormat.ImageStoreFormats;
 import org.eclipsefoundation.membership.portal.request.RolesAllowed;
+import org.eclipsefoundation.membership.portal.request.model.OrganizationInfoUpdateRequest;
+import org.eclipsefoundation.membership.portal.request.model.OrganizationLogoUpdateRequest;
 import org.eclipsefoundation.membership.portal.service.ImageStoreService;
 import org.eclipsefoundation.membership.portal.service.WorkingGroupsService;
 import org.eclipsefoundation.persistence.dao.impl.DefaultHibernateDao;
@@ -528,4 +528,5 @@ public class OrganizationResource extends AbstractRESTResource {
         }
         return activityList;
     }
+
 }
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/WorkingGroupLevelsResource.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/WorkingGroupLevelsResource.java
index 51075e35ddb5327008662252fc78d58e31fec32d..1a6587a5b2a7ff18c362837d0d94fbc55af0b67f 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/WorkingGroupLevelsResource.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/resources/WorkingGroupLevelsResource.java
@@ -11,12 +11,15 @@
  */
 package org.eclipsefoundation.membership.portal.resources;
 
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -36,14 +39,15 @@ public class WorkingGroupLevelsResource extends AbstractRESTResource {
     WorkingGroupsService wgService;
 
     @GET
-    public Response getWorkingGroups() {
+    public Response getWorkingGroups(@QueryParam("parent_organization") String parentOrganization,
+            @QueryParam("status") List<String> statuses) {
         // return the results as a response
-        return Response.ok(wgService.get()).build();
+        return Response.ok(wgService.get(parentOrganization, statuses)).build();
     }
 
     @GET
     @Path("{name}")
-    public Response getWorkingGroups(@PathParam("name") String name) {
+    public Response getWorkingGroup(@PathParam("name") String name) {
         // return the results as a response
         return Response.ok(wgService.getByName(name)).build();
     }
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/MailerService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/MailerService.java
index a19cd9adc1e10b545b2d8c0fd9f1c7cbaf962252..e95d0fa05776ef647ad8ffa5142363a05aff0394 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/MailerService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/MailerService.java
@@ -1,6 +1,7 @@
 package org.eclipsefoundation.membership.portal.service;
 
-import org.eclipsefoundation.membership.portal.model.ContactRemovalRequest;
+import org.eclipsefoundation.membership.portal.model.ContactRemovalRequestData;
+import org.eclipsefoundation.membership.portal.request.model.ContactRemovalRequest;
 
 /**
  * Interface defining emails that need to be generated and sent as part of the submission of the membership forms to the
@@ -21,5 +22,5 @@ public interface MailerService {
      * 
      * @param request the information for the user removal request
      */
-    void sendContactRemovalNotification(ContactRemovalRequest request);
+    void sendContactRemovalNotification(ContactRemovalRequestData request);
 }
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
index 6cc9e94e8eb480a7d77ded59c176b0d226c0dd8d..d9382a932615c1db6581cc78332528bdd6b17d1f 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
@@ -25,9 +25,17 @@ import org.eclipsefoundation.membership.portal.model.WorkingGroupMap.WorkingGrou
  *
  */
 public interface WorkingGroupsService {
-    public Set<WorkingGroup> get();
+
+    /**
+     * Returns a set of working groups, with an optional filter of the parent organization and project status.
+     * 
+     * @param parentOrganization optional, name of org to filter working groups by
+     * @param projectStatus optional, statuses to include in result set
+     * @return set of working groups matching optional filters if present, otherwise all available working groups
+     */
+    public Set<WorkingGroup> get(String parentOrganization, List<String> projectStatus);
 
     public WorkingGroup getByName(String name);
-    
+
     public Map<String, List<String>> getWGPADocumentIDs();
 }
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultMailerService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultMailerService.java
index 6f5d1d713de927564a49b8d42cd7fbf61f4b889d..281aa9f36cee1ddb559d957239f67fed4de7db7b 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultMailerService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultMailerService.java
@@ -9,7 +9,8 @@ import javax.inject.Inject;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.eclipsefoundation.membership.portal.model.ContactRemovalRequest;
+import org.eclipsefoundation.membership.portal.model.ContactRemovalRequestData;
+import org.eclipsefoundation.membership.portal.request.model.ContactRemovalRequest;
 import org.eclipsefoundation.membership.portal.service.MailerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -97,9 +98,9 @@ public class DefaultMailerService implements MailerService {
     }
 
     @Override
-    public void sendContactRemovalNotification(ContactRemovalRequest request) {
+    public void sendContactRemovalNotification(ContactRemovalRequestData request) {
         // check access and data integrity before sending notification
-        checkRemovalRequest(request);
+        checkRemovalRequest(request.getRawRequest());
         // get the logged in user who will receive the notification
         DefaultJWTCallerPrincipal defaultPrin = (DefaultJWTCallerPrincipal) ident.getPrincipal();
         String name = generateName(defaultPrin);
@@ -107,7 +108,7 @@ public class DefaultMailerService implements MailerService {
         Mail m = Mail
                 .withHtml(defaultPrin.getClaim("email"),
                         String.format("[Contact Removal Request] - Request to remove user '%s' from organization %s",
-                                request.getUsername(), request.getOrganizationId()),
+                                request.getPerson().getPersonID(), request.getOrganization().getOrganizationID()),
                         contactRemovalNotificationWeb.data(EMAIL_DATA_VAR, request, EMAIL_NAME_VAR, name, EMAIL_NOW_VAR,
                                 LocalDateTime.now(), IS_PDF_VAR, false, EMAIL_CURRENT_USER_VAR, defaultPrin.getName())
                                 .render())
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
index 579b7107ac105fe1cbac8ee7b05a5be928739892..afaec1fb293f96b5d4d116344d30785e8c68b953 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
@@ -14,22 +14,19 @@ package org.eclipsefoundation.membership.portal.service.impl;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipsefoundation.membership.portal.model.WorkingGroupMap;
 import org.eclipsefoundation.membership.portal.model.WorkingGroupMap.WorkingGroup;
@@ -53,10 +50,6 @@ import io.quarkus.runtime.Startup;
 public class DefaultWorkingGroupsService implements WorkingGroupsService {
     public static final Logger LOGGER = LoggerFactory.getLogger(DefaultWorkingGroupsService.class);
 
-    @ConfigProperty(name = "eclipse.working-groups.deny-list", defaultValue = "")
-    Instance<List<String>> denyList;
-    @ConfigProperty(name = "eclipse.working-groups.allow-list", defaultValue = "")
-    Optional<List<String>> allowList;
     @ConfigProperty(name = "eclipse.working-groups.filepath")
     String filepath;
 
@@ -83,14 +76,11 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
     }
 
     @Override
-    public Set<WorkingGroup> get() {
-        // if allow list present, use it, otherwise use denylist
-        Predicate<Entry<String, WorkingGroup>> checkAllowed = allowList().isEmpty()
-                ? entry -> !denyList().contains(entry.getKey())
-                : entry -> allowList().contains(entry.getKey());
-
-        return new HashSet<>(wgs.entrySet().stream().filter(checkAllowed::test)
-                .collect(Collectors.toMap(Entry::getKey, Entry::getValue)).values());
+    public Set<WorkingGroup> get(String parentOrganization, List<String> projectStatuses) {
+        return new HashSet<>(
+                wgs.entrySet().stream().filter(e -> filterByParentOrganization(parentOrganization, e.getValue()))
+                        .filter(e -> filterByProjectStatuses(projectStatuses, e.getValue()))
+                        .collect(Collectors.toMap(Entry::getKey, Entry::getValue)).values());
     }
 
     @Override
@@ -105,12 +95,18 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
         return wgToDocument;
     }
 
-    private List<String> denyList() {
-        return denyList.stream().flatMap(List::stream).collect(Collectors.toList());
+    private boolean filterByParentOrganization(String parentOrganization, WorkingGroup wg) {
+        if (StringUtils.isBlank(parentOrganization)) {
+            return true;
+        }
+        return wg.getParentOrganization().equals(parentOrganization);
     }
 
-    private List<String> allowList() {
-        return allowList.isPresent() ? new ArrayList<>(allowList.get()) : Collections.emptyList();
+    private boolean filterByProjectStatuses(List<String> statuses, WorkingGroup wg) {
+        if (statuses == null || statuses.isEmpty()) {
+            return true;
+        }
+        return statuses.contains(wg.getStatus());
     }
 
     private List<String> extractWGPADocumentIDs(WorkingGroup wg) {
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/FoundationDBOrganizationService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/FoundationDBOrganizationService.java
index 5bd859ee31321db5e50bc5f404814502427d025a..f3503416b4aba62a6f18ff9350fd06a8641a8ed6 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/FoundationDBOrganizationService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/FoundationDBOrganizationService.java
@@ -12,6 +12,7 @@
 package org.eclipsefoundation.membership.portal.service.impl;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
@@ -408,7 +409,12 @@ public class FoundationDBOrganizationService implements OrganizationsService {
             // retrieve the descriptions of the organization
             out.setDescription(
                     MemberOrganizationDescription.builder().setLongDescription(info.getLongDescription()).build());
-            out.setWebsite(info.getCompanyUrl());
+            try {
+                new URI(info.getCompanyUrl());
+                out.setWebsite(info.getCompanyUrl());
+            } catch (URISyntaxException e) {
+                LOGGER.debug("Error while converting URL for organization '{}', leaving blank", info.getOrganizationID(), e);
+            }
         }
 
         // retrieve the logos of the organization
diff --git a/portal/src/main/resources/application-dev.properties b/portal/src/main/resources/application-dev.properties
index 031e3e355d48ca30c8f895bd5f2e9275be049826..a9fd6f7c7c0424e501a0ecd72bc06f9837f14959 100644
--- a/portal/src/main/resources/application-dev.properties
+++ b/portal/src/main/resources/application-dev.properties
@@ -1,5 +1,5 @@
 ## DEV SETTINGS (creates a more test-friendly internal env) 
-security.csrf.enabled = true
+security.csrf.enabled = false
 eclipse.dataloader.user-ids=malowe, cguindon, epoirier, zhoufang
 eclipse.app.base-url=http://localhost:8090/
 eclipse.image-store.file-path=/home/martin/localdev/membership.eclipse.org/volumes/imagestore
diff --git a/portal/src/main/resources/application-ohwg.properties b/portal/src/main/resources/application-ohwg.properties
index cbf4e683699695055bcb73279486867b888bebb5..e1ffc7d46609124e5fa5efa40013f6e1bf1b8920 100644
--- a/portal/src/main/resources/application-ohwg.properties
+++ b/portal/src/main/resources/application-ohwg.properties
@@ -2,4 +2,3 @@
 %ohwg.eclipse.app.base-url=https://membership.openhwgroup.org
 %ohwg.eclipse.api.application-group=openhwgroup
 %ohwg.eclipse.mailer.membership.inbox=membership.coordination@openhwgroup.org
-%ohwg.eclipse.working-groups.allow-list=openhw-group,openhw-europe
diff --git a/portal/src/main/resources/application.properties b/portal/src/main/resources/application.properties
index 59c5601d71ba93c535f7429e80542d73ce98154f..6fb6c1b2104f5ef7946cf84ea59882564c1fd289 100644
--- a/portal/src/main/resources/application.properties
+++ b/portal/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 quarkus.log.level=INFO
-quarkus.http.port=8090
+quarkus.http.port=8092
 quarkus.http.cors=false
 eclipse.cors.enabled=false
 security.csrf.distributed-mode.default-provider=false
@@ -20,7 +20,6 @@ ef-api/mp-rest/scope=javax.inject.Singleton
 ## Required for wg interim solution, remove when moved to external API
 quarkus.native.resources.includes=working_groups.json,templates/**
 eclipse.working-groups.filepath=working_groups.json
-eclipse.working-groups.deny-list=openhw-group,opengenesis,openhw-europe
 
 ## MAILER SETTINGS
 quarkus.mailer.auth-methods=DIGEST-MD5 CRAM-SHA256 CRAM-SHA1 CRAM-MD5 PLAIN LOGIN
diff --git a/portal/src/main/resources/templates/emails/crr/contact_removal_notification_template.txt b/portal/src/main/resources/templates/emails/crr/contact_removal_notification_template.txt
index 31655e2635aa5ab6d1f35c89593e2e7a39fd4c89..993d25baba5250e0919f6ffe60e5ebbe5402325a 100644
--- a/portal/src/main/resources/templates/emails/crr/contact_removal_notification_template.txt
+++ b/portal/src/main/resources/templates/emails/crr/contact_removal_notification_template.txt
@@ -1,11 +1,13 @@
 Dear {name},  
 
-This email is to confirm that you have requested to remove the following contact on behalf of your organization.  
+This email is to confirm that you have requested to remove the following individual as a contact associated with your organization.  
   
-Organization: {data.getOrganizationId}  
-Username: {data.getUsername}  
+Organization: {data.getOrganization.getName} ({data.getOrganization.getOrganizationID})  
+Username: {data.getPerson.getLname}, {data.getPerson.getFname}({data.getPerson.getPersonID})  
 Reason: {data.getReason}  
   
+The Eclipse Foundation team will act on your request as soon as possible, and typically within two business days. We will reach out to you should there be any questions.  Also, please note that this action will not remove the individual from the Eclipse Foundation records, but rather will simply disassociate the individual with your organization.  
+  
 If you have not made this request, kindly reach out to membership.coordination@eclipse-foundation.org.  
   
 Thank you,  
diff --git a/portal/src/main/resources/templates/emails/crr/contact_removal_notification_web_template.html b/portal/src/main/resources/templates/emails/crr/contact_removal_notification_web_template.html
index 5a7f9b29ef894206c6a693077e92fe84d6e18e11..097ece29925255fb877468725fc6d54f6bd6d2b6 100644
--- a/portal/src/main/resources/templates/emails/crr/contact_removal_notification_web_template.html
+++ b/portal/src/main/resources/templates/emails/crr/contact_removal_notification_web_template.html
@@ -2,12 +2,13 @@
   <div style="min-width: 700px; width: 66%; background: #FFF; margin: auto; margin-top: -20px; margin-bottom: -20px;">
     <div style="padding: 20px">
       <p>Dear {name},</p>
-      <p>This email is to confirm that you have requested to remove the following contact on behalf of your organization.</p>
+      <p>This email is to confirm that you have requested to remove the following individual as a contact associated with your organization.</p>
       <div>
-        <p style="margin: 0px">Organization: {data.getOrganizationId}</p>
-        <p style="margin: 0px">Username: {data.getUsername}</p>
+        <p style="margin: 0px">Organization: {data.getOrganization.getName} ({data.getOrganization.getOrganizationID})</p>
+        <p style="margin: 0px">User: {data.getPerson.getLname}, {data.getPerson.getFname}({data.getPerson.getPersonID})</p>
         <p style="margin: 0px;margin-top:15px;">Reason: {data.getReason}</p>
       </div>
+      <p>The Eclipse Foundation team will act on your request as soon as possible, and typically within two business days. We will reach out to you should there be any questions.  Also, please note that this action will not remove the individual from the Eclipse Foundation records, but rather will simply disassociate the individual with your organization.</p>
       <p>If you have not made this request, kindly reach out to membership.coordination@eclipse-foundation.org.</p>
       <p>Thank you,</p>
       <p>Membership Coordination Team</p>
diff --git a/portal/src/main/resources/templates/emails/membership/form_membership_email_template.txt b/portal/src/main/resources/templates/emails/membership/form_membership_email_template.txt
deleted file mode 100644
index 74e7ed0fd4beb552c2cfb945ff82291a30440508..0000000000000000000000000000000000000000
--- a/portal/src/main/resources/templates/emails/membership/form_membership_email_template.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-{#include emails/membership_header /}
-New form submission by: {data.name} ({data.form.userID})
-
-Organization
-Name: {data.org.legalName}
-Twitter: {data.org.twitterHandle}
-Requires purchase order: {data.form.purchaseOrderRequired}
-VAT number: {data.form.vatNumber}  
-VAT Registration country: {data.form.registrationCountry}  
-Aggregate Revenue: {data.org.aggregateRevenue}
-Employee count: {data.org.employeeCount}
-Organization Type: {data.org.organizationType}
- 
-Address
-{data.org.address.addressLine1}
-{data.org.address.addressLine2}
-{data.org.address.locality}, {data.org.address.administrativeArea}
-{data.org.address.country}
-{data.org.address.postalCode}
-  
-
-
-Contacts
-{#for contact in data.contacts.orEmpty}
-
-Name: {contact.fName} {contact.lName}
-Email: {contact.email}
-Title: {contact.title}
-Contact type: {contact.type}
-userID
-{/for}
-
-Working Groups
-
-{#for wg in data.wgs.orEmpty}
-Working Group: {wg.workingGroupID}
-Participation Level: {wg.participationLevel}
-Effective Date: {wg.effectiveDate}
-Contact Name: {wg.contact.fName} {wg.contact.lName}
-
-{/for}
-{#include emails/membership_footer /}
\ No newline at end of file
diff --git a/portal/src/main/resources/templates/emails/membership/form_membership_email_web_template.html b/portal/src/main/resources/templates/emails/membership/form_membership_email_web_template.html
deleted file mode 100644
index 7a7af0ab5546d31e9791643211032492e52f0b66..0000000000000000000000000000000000000000
--- a/portal/src/main/resources/templates/emails/membership/form_membership_email_web_template.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<div style="{#if !context.isPDF}background: #efefef; {/if}margin-left: -10px; margin-right: -10px;">
-  <div style="{#if !context.isPDF}min-width: 700px; width: 66%; background: #FFF; {/if} margin: auto; margin-top: -20px; margin-bottom: -20px;">
-    <div style="padding: 20px">
-      {#include emails/membership_web_header /}
-      <p>Form submission by: {data.name} ({data.form.userID})</p>
-      <h2>Organization</h2>
-      <p style="margin: 0px">Name: {data.org.legalName}</p>
-      <p style="margin: 0px;">Aggregate Revenue: {data.org.aggregateRevenue}</p>
-      <p style="margin: 0px;">Employee Count: {data.org.employeeCount}</p>
-      <p style="margin: 0px;">Organization Type: {data.org.organizationType}</p>
-      <p style="margin: 0px;">Twitter: {data.org.twitterHandle}</p>
-      <p style="margin: 0px;">Requires Purchase Order: {data.form.purchaseOrderRequired}</p>
-      <p style="margin: 0px;">VAT Number: {data.form.vatNumber}</p>
-      <p style="margin: 0px">VAT Registration Country: {data.form.registrationCountry}</p>
-      <p style="margin: 0px">Membership Level: {data.form.membershipLevel}</p>
-      <div>
-        <h3>Address</h3>
-        <p>
-          {data.org.address.addressLine1}<br />{data.org.address.addressLine2}<br />{data.org.address.locality}<br /> {data.org.address.administrativeArea}<br /> {data.org.address.country}<br /> {data.org.address.postalCode}
-        </p>
-      </div>
-
-      <h2>Contacts</h2>
-      <table style="width: 100%">
-        <thead style="background: #dfdfdf">
-          <tr>
-            <th>Name</th>
-            <th>Email</th>
-            <th>Title</th>
-            <th>Type</th>
-          </tr>
-        </thead>
-        <tbody>
-          {#for contact in data.contacts.orEmpty}
-          <tr {#if even} style="background: #efefef"{/if}>
-            <td>{contact.fName} {contact.lName}</td>
-            <td>{contact.email}</td>
-            <td>{contact.title}</td>
-            <td>{contact.type}</td>
-          </tr>
-          {/for}
-        </tbody>
-      </table>
-
-
-      <h2>Working Groups</h2>
-      <table style="width: 100%">
-        <thead style="background: #dfdfdf">
-          <tr>
-            <th>Working Group</th>
-            <th>Participation Level</th>
-            <th>Effective Date</th>
-            <th>Contact Name</th>
-          </tr>
-        </thead>
-        <tbody>
-          {#for wg in data.wgs.orEmpty}
-          <tr {#if even} style="background: #efefef"{/if}>
-            <td>{wg.workingGroupID}</td>
-            <td>{wg.participationLevel}</td>
-            <td>{#if wg.effectiveDate != null}{time:format(wg.effectiveDate,'d MMM uuuu')}{/if}</td>
-            <td>{#if wg.contact != null}{wg.contact.fName} {wg.contact.lName}{/if}</td>
-          </tr>
-          {/for}
-        </tbody>
-      </table>
-      {#include emails/membership_web_footer /}
-    </div>
-  </div>
-</div>
diff --git a/portal/src/main/resources/working_groups.json b/portal/src/main/resources/working_groups.json
index 74156f03239a77359e5a8116b2a0bf6f97a20d44..c5c9a42a048dbc6acdeeb0998f1264e913c2205f 100644
--- a/portal/src/main/resources/working_groups.json
+++ b/portal/src/main/resources/working_groups.json
@@ -1,826 +1,852 @@
 {
-	"working_groups": {
-		"adoptium": {
-			"alias": "adoptium",
-			"title": "Adoptium Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-adoptium.svg",
-			"description": "The Adoptium Working Group promotes and supports high-quality runtimes and associated technology for use across the Java ecosystem. Our vision is to meet the needs of Eclipse and the broader Java community by providing runtimes for Java-based applications. We embrace existing standards and a wide variety of hardware and cloud platforms.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/adoptium-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "32c5a745df264aa2a809",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
-					}
-				},
-				"website": "https://adoptium.net",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGDSA",
-					"description": "Enterprise Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"asciidoc": {
-			"alias": "asciidoc",
-			"title": "AsciiDoc® Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_asciidoc.svg",
-			"description": "The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/asciidoc-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "9cc0aa80da4741eefc4c",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-individual-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "df911e0adcad1a1c51df",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://asciidoc-wg.eclipse.org",
-				"members": "https://asciidoc-wg.eclipse.org/membership/members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAA",
-					"description": "Partner Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"cloud-development-tools": {
-			"alias": "cloud-development-tools",
-			"title": "Eclipse Cloud Development (ECD) Tools Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-ecd-tools.png",
-			"description": "The Eclipse Cloud Development (ECD) Tools Working Group drives the evolution and broad adoption of de facto standards for cloud development tools, including language support, extensions, and developer workspace definition.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_cloud_development_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d96a8cabd0d04f29dfe6",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
-					}
-				},
-				"website": "https://ecdtools.eclipse.org/",
-				"members": "https://ecdtools.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/ecdtools"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"eclipse-ide": {
-			"alias": "eclipse-ide",
-			"title": "Eclipse® IDE Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_eclipse_ide.svg",
-			"description": "The Eclipse® IDE Working Group is formed to ensure the continued sustainability, integrity, evolution and adoption of the Eclipse IDE suite of products and related technologies. In particular, it is formed to provide governance, guidance, and funding for the communities that support the delivery of the Eclipse Foundation’s flagship “Eclipse IDE” products.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse-ide-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "fb4d6a3ddca7cfc1de0d",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-ide-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://ide-wg.eclipse.org",
-				"members": "https://ide-wg.eclipse.org/index.html#members",
-				"sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
-				"contact_form": "https://ide-wg.eclipse.org/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGIDE",
-					"description": "Supporter Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"edge-native": {
-			"alias": "edge-native",
-			"title": "Eclipse Edge Native Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-edgenative.png",
-			"description": "The Eclipse Edge Native Working Group drives the adoption of Edge Computing technologies. It provides services like vendor-neutral marketing to the Eclipse Edge Native ecosystem and defines licensing and intellectual property flows that encourage the community to open collaboration",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_edge_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "595efa7bce8fffe3dcaf",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-edge-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://edgenative.eclipse.org/",
-				"members": "https://edgenative.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGFVA",
-					"description": "Gold Member"
-				},
-				{
-					"relation": "WGHLP",
-					"description": "Silver Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"internet-things-iot": {
-			"alias": "internet-things-iot",
-			"title": "Eclipse IoT Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_iot.svg",
-			"description": "The Eclipse IoT Working Group enables collaboration on the development of open source implementations of IoT standards and protocols, frameworks and services used by IoT solutions, and tools for IoT developers for commercial-grade IoT.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/iotwg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "598b0ec4df9dcbb23499",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-iot-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://iot.eclipse.org",
-				"members": "https://iot.eclipse.org/membership/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/iot"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"jakarta-ee": {
-			"alias": "jakarta-ee",
-			"title": "Jakarta EE Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_jakarta.png",
-			"description": "The Jakarta EE Working Group enables Java ecosystem players to collaborate on advancing enterprise Java technologies in the cloud. This initiative focuses on cultivating the business interests associated with Eclipse Enterprise for Java (EE4J) technologies.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/jakarta_ee_charter.php",
-				"participation_agreement": {
-					"individual": "",
-					"organization": "",
-					"default": ""
-				},
-				"participation_agreements": {
-					"individual": {
-						"document_id": "76ef85c1acbb4fb6d348",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-individual-working-group-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "e3985a1aead45e62ef7b",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://jakarta.ee",
-				"members": "https://jakarta.ee/membership/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/jakarta-ee"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGDSA",
-					"description": "Enterprise Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"microprofile": {
-			"alias": "microprofile",
-			"title": "MicroProfile® Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_microprofile.svg",
-			"description": "The MicroProfile® Working Group drives the evolution and broad adoption of technologies related to the MicroProfile Project. MicroProfile is an open forum that optimizes Enterprise Java for a microservice architecture by innovating across multiple implementations and collaborating on common areas of interest with a goal of standardization.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/microprofile-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "1cb0c421ab3ddd2fbaf8",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement-individual.pdf"
-					},
-					"organization": {
-						"document_id": "8d438deac670301c236d",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://microprofile.io/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "abcde",
-					"description": "Corporate Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openadx": {
-			"alias": "openadx",
-			"title": "OpenADx Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openadx.png",
-			"description": "The OpenADx Working Group is centered around the autonomous driving toolchain and aims to bring transparency and better integration capabilities into the autonomous driving tool space.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openadx_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d0358f01f03deb7eccea",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openadx-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openadx.eclipse.org/",
-				"members": "https://openadx.eclipse.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGHIL",
-					"description": "Development Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"opengenesis": {
-			"alias": "opengenesis",
-			"title": "openGENESIS Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-opengenesis-logo.svg",
-			"description": "Before deployment onto public roads, artificial intelligence (AI) must be proven safe and roadworthy. The openGENESIS Working Group aims to foster, support and provide knowledge, methods, and tools for the assessment of AI used in autonomous driving applications.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/opengenesis_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "c282723cbb8ab2e2ed9e",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/opengenesis-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://wiki.eclipse.org/OpenGENESIS_WG",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGHIL",
-					"description": "Development Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openmdm": {
-			"alias": "openmdm",
-			"title": "openMDM Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/mdm_logo.gif",
-			"description": "The openMDM Working Group fosters and supports an open and innovative eco-system providing tools and systems, qualification kits and adapters for standardized and vendor independent management of measurement data in accordance with the ASAM ODS standard.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/mdmwg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "776731a0c98fcf80ee81",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmdm-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openmdm.org",
-				"members": "https://openmdm.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGKNA",
-					"description": "Application Member"
-				},
-				{
-					"relation": "WGJAN",
-					"description": "Service Provider Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openmobility": {
-			"alias": "openmobility",
-			"title": "openMobility Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openmobility.png",
-			"description": "The openMobility Working Group drives the evolution and broad adoption of mobility modelling and simulation technologies.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openmobility_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "4d0545bdd64b0a98f5b2",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmobility-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openmobility.eclipse.org/",
-				"members": "https://openmobility.eclipse.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				}
-			]
-		},
-		"openpass": {
-			"alias": "openpass",
-			"title": "openPASS Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openpass.png",
-			"description": "The openPASS Working Group promotes a collaborative and innovative ecosystem by offering tools, systems, and adapters for a standardized, openly-available and vendor-neutral platform for traffic scenario simulation.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openpasswg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "aea0514f5cc2d0407ffd",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openpass-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openpass.eclipse.org/",
-				"members": "https://openpass.eclipse.org/about/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGJAN",
-					"description": "Service Provider Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"osgi": {
-			"alias": "osgi",
-			"title": "OSGi Working Group ",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-osgi.png",
-			"description": "The OSGi Working Group drives the evolution and broad adoption of software technologies derived from or related to the OSGi Specification Project which is an open source initiative to create software specifications, compatible implementations and TCKs to enable development, deployment and management of embedded, server-side, and cloud-native applications by using software modularity to vastly improve the evolution, maintainability, and interoperability of applications and infrastructure.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/osgi-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "c7975e1d05ffd0a8ebe1",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-individual-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "68db2919ffe553250ae8",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://www.osgi.org/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"sparkplug": {
-			"alias": "sparkplug",
-			"title": "Eclipse Sparkplug Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-sparkplug.svg",
-			"description": "The Eclipse Sparkplug Working Group drives the evolution and broad adoption of the Eclipse Sparkplug protocol and related technologies that enable the creation of open, collaborative, and interoperable Industrial IoT solutions, and a framework for supporting Industry 4.0.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_sparkplug_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "f351fc9ba96cb468393f",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/sparkplug-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://sparkplug.eclipse.org/",
-				"members": "https://sparkplug.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"gemoc": {
-			"alias": "gemoc",
-			"title": "GEMOC Research Consortium",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_gemoc-rc.png",
-			"description": "The GEMOC Research Consortium is an open and collaborative initiative which supports the development, coordination, and dissemination of the research efforts on the use and globalization of modeling languages.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/gemoc_rc_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://gemoc.org",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				}
-			]
-		},
-		"science": {
-			"alias": "science",
-			"title": "Science Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_science.png",
-			"description": "The Science Working Group represents a collaborative effort involving industry, academia, and government with the purpose of developing reusable open source software for scientific research",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/science_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://science.eclipse.org",
-				"members": "https://science.eclipse.org/membership/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				}
-			]
-		},
-		"openhw-group": {
-			"alias": "openhw-group",
-			"title": "OpenHW Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openhw.svg",
-			"description": "OpenHW Group is an independent not-for-profit, global organization where hardware and software designers collaborate in the development of open-source cores, related IP, tools and software, using industry best practices. OpenHW has released its first 32bit RISC-V compliant processor core and has several processor cores in active development.",
-			"resources": {
-				"charter": "",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://www.openhwgroup.org",
-				"members": "https://www.openhwgroup.org/membership/members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership",
-				"membership": "https://www.openhwgroup.org/membership"
-			},
-			"levels": []
-		},
-		"oniro": {
-			"alias": "oniro",
-			"title": "Oniro Working Group",
-			"status": "proposed",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-oniro.png",
-			"description": "The Oniro Working Group will foster an ecosystem of organizations that supports the community in the production and evolution of the Oniro operating system and platform. Oniro is a new commercially oriented, modular, and multikernel open source software platform. Its ecosystem will be developed in an environment where collaboration is promoted via the core Eclipse Foundation principles of vendor-neutrality, transparency, and openness.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/oniro-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "f348c2873ca8ed8e9eca",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/oniro-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://oniroproject.org/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGFVA",
-					"description": "Gold Member"
-				},
-				{
-					"relation": "WGHLP",
-					"description": "Silver Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openhw-asia": {
-			"alias": "openhw-asia",
-			"title": "OpenHW Asia Working Group",
-			"status": "proposed",
-			"logo": "",
-			"description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to address Asia-focused initiatives complementing the work program of the OpenHW Group. Those initiatives may address strategic or market analysis, technical requirements, and digital sovereignty.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openhw-asia-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "a3f1857c324e91b7f05f",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-asia-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openhw-europe": {
-			"alias": "openhw-europe",
-			"title": "OpenHW Europe Working Group",
-			"status": "active",
-			"logo": "",
-			"description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to engage in initiatives complementing the general work program of the OpenHW Group that are of strategic interest to the joint members of Eclipse Foundation and OpenHW Group that relate to the European marketplace, including strategic market analysis, development of technical requirements, and digital sovereignty.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openhw-europe-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d292143a3fad6b5e6ebe",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-europe-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://www.openhwgroup.org/europe",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership",
-				"membership": ""
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"aice": {
-			"alias": "aice",
-			"title": "Eclipse AI, Cloud & Edge (AICE) Working Group",
-			"status": "proposed",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-aice.svg",
-			"description": "The Eclipse AI, Cloud & Edge (AICE) Working Group will manage and operate an open lab (the “AICE OpenLab”) that will provide a set of resources to promote the advancement, implementation, and verification of open source software for AI, Cloud, and Edge computing.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/aice-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "a8bc59bfcd17d5a42f1e",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/aice-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://aice.eclipse.org/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"sdv": {
-			"alias": "sdv",
-			"title": "Eclipse Software Defined Vehicle Working Group",
-			"status": "proposed",
-			"logo": "",
-			"description": "The Eclipse Software Defined Vehicle (SDV) Working Group will provide a forum for individuals and organizations to build and promote open source software, specifications, and open collaboration models needed to create a scalable, modular, extensible, industry-ready open source licensed vehicle software platform to support in-vehicle and around the vehicle applications development and deployment.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/sdv-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "fbb9be0bc283dc584b23",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/sdv-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://sdv.eclipse.org/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSM",
-					"description": "Supporting Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		}
-	}
-}
\ No newline at end of file
+  "working_groups": {
+    "adoptium": {
+      "alias": "adoptium",
+      "title": "Adoptium Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-adoptium.svg",
+      "description": "The Adoptium Working Group promotes and supports high-quality runtimes and associated technology for use across the Java ecosystem. Our vision is to meet the needs of Eclipse and the broader Java community by providing runtimes for Java-based applications. We embrace existing standards and a wide variety of hardware and cloud platforms.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/adoptium-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "32c5a745df264aa2a809",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
+          }
+        },
+        "website": "https://adoptium.net",
+        "members": "https://adoptium.net/members.html",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGDSA",
+          "description": "Enterprise Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "asciidoc": {
+      "alias": "asciidoc",
+      "title": "AsciiDoc® Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_asciidoc.svg",
+      "description": "The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/asciidoc-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "9cc0aa80da4741eefc4c",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "df911e0adcad1a1c51df",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://asciidoc-wg.eclipse.org",
+        "members": "https://asciidoc-wg.eclipse.org/membership/members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAA",
+          "description": "Partner Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "cloud-development-tools": {
+      "alias": "cloud-development-tools",
+      "title": "Eclipse Cloud Development (ECD) Tools Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-ecd-tools.svg",
+      "description": "The Eclipse Cloud Development (ECD) Tools Working Group drives the evolution and broad adoption of de facto standards for cloud development tools, including language support, extensions, and developer workspace definition.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_cloud_development_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d96a8cabd0d04f29dfe6",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
+          }
+        },
+        "website": "https://ecdtools.eclipse.org/",
+        "members": "https://ecdtools.eclipse.org/#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/ecdtools"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "eclipse-ide": {
+      "alias": "eclipse-ide",
+      "title": "Eclipse® IDE Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_eclipse_ide.svg",
+      "description": "The Eclipse® IDE Working Group is formed to ensure the continued sustainability, integrity, evolution and adoption of the Eclipse IDE suite of products and related technologies. In particular, it is formed to provide governance, guidance, and funding for the communities that support the delivery of the Eclipse Foundation’s flagship “Eclipse IDE” products.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse-ide-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "fb4d6a3ddca7cfc1de0d",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-ide-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://ide-wg.eclipse.org",
+        "members": "https://ide-wg.eclipse.org/index.html#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://ide-wg.eclipse.org/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGIDE",
+          "description": "Supporter Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "edge-native": {
+      "alias": "edge-native",
+      "title": "Eclipse Edge Native Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-edgenative.svg",
+      "description": "The Eclipse Edge Native Working Group drives the adoption of Edge Computing technologies. It provides services like vendor-neutral marketing to the Eclipse Edge Native ecosystem and defines licensing and intellectual property flows that encourage the community to open collaboration",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_edge_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "595efa7bce8fffe3dcaf",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-edge-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://edgenative.eclipse.org/",
+        "members": "https://edgenative.eclipse.org/#members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGFVA",
+          "description": "Gold Member"
+        },
+        {
+          "relation": "WGHLP",
+          "description": "Silver Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "internet-things-iot": {
+      "alias": "internet-things-iot",
+      "title": "Eclipse IoT Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_iot.svg",
+      "description": "The Eclipse IoT Working Group enables collaboration on the development of open source implementations of IoT standards and protocols, frameworks and services used by IoT solutions, and tools for IoT developers for commercial-grade IoT.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/iotwg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "598b0ec4df9dcbb23499",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-iot-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://iot.eclipse.org",
+        "members": "https://iot.eclipse.org/membership/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/iot"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "jakarta-ee": {
+      "alias": "jakarta-ee",
+      "title": "Jakarta EE Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-jakarta.svg",
+      "description": "The Jakarta EE Working Group enables Java ecosystem players to collaborate on advancing enterprise Java technologies in the cloud. This initiative focuses on cultivating the business interests associated with Eclipse Enterprise for Java (EE4J) technologies.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/jakarta_ee_charter.php",
+        "participation_agreement": {
+          "individual": "",
+          "organization": "",
+          "default": ""
+        },
+        "participation_agreements": {
+          "individual": {
+            "document_id": "76ef85c1acbb4fb6d348",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-individual-working-group-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "e3985a1aead45e62ef7b",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://jakarta.ee",
+        "members": "https://jakarta.ee/membership/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/jakarta-ee"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGDSA",
+          "description": "Enterprise Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "microprofile": {
+      "alias": "microprofile",
+      "title": "MicroProfile® Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_microprofile.svg",
+      "description": "The MicroProfile® Working Group drives the evolution and broad adoption of technologies related to the MicroProfile Project. MicroProfile is an open forum that optimizes Enterprise Java for a microservice architecture by innovating across multiple implementations and collaborating on common areas of interest with a goal of standardization.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/microprofile-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "1cb0c421ab3ddd2fbaf8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement-individual.pdf"
+          },
+          "organization": {
+            "document_id": "8d438deac670301c236d",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://microprofile.io/",
+        "members": "https://microprofile.io/workinggroup/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "abcde",
+          "description": "Corporate Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openadx": {
+      "alias": "openadx",
+      "title": "OpenADx Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openadx.svg",
+      "description": "The OpenADx Working Group is centered around the autonomous driving toolchain and aims to bring transparency and better integration capabilities into the autonomous driving tool space.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openadx_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d0358f01f03deb7eccea",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openadx-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openadx.eclipse.org/",
+        "members": "https://openadx.eclipse.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGHIL",
+          "description": "Development Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "opengenesis": {
+      "alias": "opengenesis",
+      "title": "openGENESIS Working Group",
+      "status": "inactive",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-opengenesis-logo.svg",
+      "description": "Before deployment onto public roads, artificial intelligence (AI) must be proven safe and roadworthy. The openGENESIS Working Group aims to foster, support and provide knowledge, methods, and tools for the assessment of AI used in autonomous driving applications.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/opengenesis_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "c282723cbb8ab2e2ed9e",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/opengenesis-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://wiki.eclipse.org/OpenGENESIS_WG",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGHIL",
+          "description": "Development Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openmdm": {
+      "alias": "openmdm",
+      "title": "openMDM Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openmdm.svg",
+      "description": "The openMDM Working Group fosters and supports an open and innovative eco-system providing tools and systems, qualification kits and adapters for standardized and vendor independent management of measurement data in accordance with the ASAM ODS standard.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/mdmwg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "776731a0c98fcf80ee81",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmdm-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openmdm.org",
+        "members": "https://openmdm.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGKNA",
+          "description": "Application Member"
+        },
+        {
+          "relation": "WGJAN",
+          "description": "Service Provider Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openmobility": {
+      "alias": "openmobility",
+      "title": "openMobility Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openmobility.svg",
+      "description": "The openMobility Working Group drives the evolution and broad adoption of mobility modelling and simulation technologies.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openmobility_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "4d0545bdd64b0a98f5b2",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmobility-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openmobility.eclipse.org/",
+        "members": "https://openmobility.eclipse.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        }
+      ]
+    },
+    "openpass": {
+      "alias": "openpass",
+      "title": "openPASS Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openpass.svg",
+      "description": "The openPASS Working Group promotes a collaborative and innovative ecosystem by offering tools, systems, and adapters for a standardized, openly-available and vendor-neutral platform for traffic scenario simulation.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openpasswg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "aea0514f5cc2d0407ffd",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openpass-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openpass.eclipse.org/",
+        "members": "https://openpass.eclipse.org/about/#members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGJAN",
+          "description": "Service Provider Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "osgi": {
+      "alias": "osgi",
+      "title": "OSGi Working Group ",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-osgi.png",
+      "description": "The OSGi Working Group drives the evolution and broad adoption of software technologies derived from or related to the OSGi Specification Project which is an open source initiative to create software specifications, compatible implementations and TCKs to enable development, deployment and management of embedded, server-side, and cloud-native applications by using software modularity to vastly improve the evolution, maintainability, and interoperability of applications and infrastructure.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/osgi-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "c7975e1d05ffd0a8ebe1",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "68db2919ffe553250ae8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://www.osgi.org/",
+        "members": "https://www.eclipse.org/org/workinggroups/members.php?wg=osgi",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "sparkplug": {
+      "alias": "sparkplug",
+      "title": "Eclipse Sparkplug Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-sparkplug.svg",
+      "description": "The Eclipse Sparkplug Working Group drives the evolution and broad adoption of the Eclipse Sparkplug protocol and related technologies that enable the creation of open, collaborative, and interoperable Industrial IoT solutions, and a framework for supporting Industry 4.0.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_sparkplug_charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "0186c51ccfa2bc7dbbe8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/sparkplug-working-group-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "f351fc9ba96cb468393f",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/sparkplug-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://sparkplug.eclipse.org/",
+        "members": "https://sparkplug.eclipse.org/#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "gemoc": {
+      "alias": "gemoc",
+      "title": "GEMOC Research Consortium",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_gemoc-rc.png",
+      "description": "The GEMOC Research Consortium is an open and collaborative initiative which supports the development, coordination, and dissemination of the research efforts on the use and globalization of modeling languages.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/gemoc_rc_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://gemoc.org",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        }
+      ]
+    },
+    "science": {
+      "alias": "science",
+      "title": "Science Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_science.png",
+      "description": "The Science Working Group represents a collaborative effort involving industry, academia, and government with the purpose of developing reusable open source software for scientific research",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/science_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://science.eclipse.org",
+        "members": "https://science.eclipse.org/membership/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        }
+      ]
+    },
+    "openhw-group": {
+      "alias": "openhw-group",
+      "title": "OpenHW Group",
+      "status": "active",
+      "parent_organization": "ohwg",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openhw.svg",
+      "description": "OpenHW Group is an independent not-for-profit, global organization where hardware and software designers collaborate in the development of open-source cores, related IP, tools and software, using industry best practices. OpenHW has released its first 32bit RISC-V compliant processor core and has several processor cores in active development.",
+      "resources": {
+        "charter": "",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://www.openhwgroup.org",
+        "members": "https://www.openhwgroup.org/membership/members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership",
+        "membership": "https://www.openhwgroup.org/membership"
+      },
+      "levels": []
+    },
+    "oniro": {
+      "alias": "oniro",
+      "title": "Oniro Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-oniro.png",
+      "description": "The Oniro Working Group will foster an ecosystem of organizations that supports the community in the production and evolution of the Oniro operating system and platform. Oniro is a new commercially oriented, modular, and multikernel open source software platform. Its ecosystem will be developed in an environment where collaboration is promoted via the core Eclipse Foundation principles of vendor-neutrality, transparency, and openness.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/oniro-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "f348c2873ca8ed8e9eca",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/oniro-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://oniroproject.org/",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGFVA",
+          "description": "Gold Member"
+        },
+        {
+          "relation": "WGHLP",
+          "description": "Silver Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openhw-asia": {
+      "alias": "openhw-asia",
+      "title": "OpenHW Asia Working Group",
+      "status": "proposed",
+      "parent_organization": "ohwg",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openhw-asia.svg",
+      "description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to address Asia-focused initiatives complementing the work program of the OpenHW Group. Those initiatives may address strategic or market analysis, technical requirements, and digital sovereignty.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openhw-asia-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "a3f1857c324e91b7f05f",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-asia-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openhw-europe": {
+      "alias": "openhw-europe",
+      "title": "OpenHW Europe Working Group",
+      "status": "active",
+      "parent_organization": "ohwg",
+      "logo": "",
+      "description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to engage in initiatives complementing the general work program of the OpenHW Group that are of strategic interest to the joint members of Eclipse Foundation and OpenHW Group that relate to the European marketplace, including strategic market analysis, development of technical requirements, and digital sovereignty.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openhw-europe-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d292143a3fad6b5e6ebe",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-europe-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://www.openhwgroup.org/europe",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership",
+        "membership": ""
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "aice": {
+      "alias": "aice",
+      "title": "Eclipse AI, Cloud & Edge (AICE) Working Group",
+      "status": "proposed",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-aice.svg",
+      "description": "The Eclipse AI, Cloud & Edge (AICE) Working Group will manage and operate an open lab (the “AICE OpenLab”) that will provide a set of resources to promote the advancement, implementation, and verification of open source software for AI, Cloud, and Edge computing.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/aice-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "a8bc59bfcd17d5a42f1e",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/aice-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://aice.eclipse.org/",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "sdv": {
+      "alias": "sdv",
+      "title": "Software Defined Vehicle Working Group",
+      "status": "proposed",
+      "parent_organization": "eclipse",
+      "logo": "",
+      "description": "The Eclipse Software Defined Vehicle (SDV) Working Group will provide a forum for individuals and organizations to build and promote open source software, specifications, and open collaboration models needed to create a scalable, modular, extensible, industry-ready open source licensed vehicle software platform to support in-vehicle and around the vehicle applications development and deployment.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/sdv-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "fbb9be0bc283dc584b23",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/sdv-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://sdv.eclipse.org/",
+        "members": "",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSM",
+          "description": "Supporting Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    }
+  }
+}
diff --git a/portal/src/test/resources/working_groups.json b/portal/src/test/resources/working_groups.json
index a77e1aecb6c1f09876a1277cc0dcc995446bd960..3becd39143aa8854d5de1e9c06cb8e05c79e5bc3 100644
--- a/portal/src/test/resources/working_groups.json
+++ b/portal/src/test/resources/working_groups.json
@@ -1,709 +1,852 @@
 {
-	"working_groups": {
-		"adoptium": {
-			"alias": "adoptium",
-			"title": "Adoptium Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-adoptium.svg",
-			"description": "The Adoptium Working Group promotes and supports high-quality runtimes and associated technology for use across the Java ecosystem. Our vision is to meet the needs of Eclipse and the broader Java community by providing runtimes for Java-based applications. We embrace existing standards and a wide variety of hardware and cloud platforms.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/adoptium-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "32c5a745df264aa2a809",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
-					}
-				},
-				"website": "https://adoptium.net",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGDSA",
-					"description": "Enterprise Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"asciidoc": {
-			"alias": "asciidoc",
-			"title": " AsciiDoc® Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_asciidoc.svg",
-			"description": "The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/asciidoc-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "9cc0aa80da4741eefc4c",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-individual-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "df911e0adcad1a1c51df",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://asciidoc-wg.eclipse.org",
-				"members": "https://asciidoc-wg.eclipse.org/membership/members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAA",
-					"description": "Partner Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"cloud-development-tools": {
-			"alias": "cloud-development-tools",
-			"title": "Eclipse Cloud Development (ECD) Tools Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-ecd-tools.png",
-			"description": "The Eclipse Cloud Development (ECD) Tools Working Group drives the evolution and broad adoption of de facto standards for cloud development tools, including language support, extensions, and developer workspace definition.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_cloud_development_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d96a8cabd0d04f29dfe6",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
-					}
-				},
-				"website": "https://ecdtools.eclipse.org/",
-				"members": "https://ecdtools.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/ecdtools"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"eclipse-ide": {
-			"alias": "eclipse-ide",
-			"title": "Eclipse® IDE Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_eclipse_ide.svg",
-			"description": "The Eclipse® IDE Working Group is formed to ensure the continued sustainability, integrity, evolution and adoption of the Eclipse IDE suite of products and related technologies. In particular, it is formed to provide governance, guidance, and funding for the communities that support the delivery of the Eclipse Foundation’s flagship “Eclipse IDE” products.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse-ide-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "fb4d6a3ddca7cfc1de0d",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-ide-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://ide-wg.eclipse.org",
-				"members": "https://ide-wg.eclipse.org/index.html#members",
-				"sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
-				"contact_form": "https://ide-wg.eclipse.org/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGIDE",
-					"description": "Supporter Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"edge-native": {
-			"alias": "edge-native",
-			"title": "Eclipse Edge Native Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-edgenative.png",
-			"description": "The Eclipse Edge Native Working Group drives the adoption of Edge Computing technologies. It provides services like vendor-neutral marketing to the Eclipse Edge Native ecosystem and defines licensing and intellectual property flows that encourage the community to open collaboration",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_edge_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "595efa7bce8fffe3dcaf",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-edge-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://edgenative.eclipse.org/",
-				"members": "https://edgenative.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGFVA",
-					"description": "Gold Member"
-				},
-				{
-					"relation": "WGHLP",
-					"description": "Silver Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"internet-things-iot": {
-			"alias": "internet-things-iot",
-			"title": "Eclipse IoT Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_iot.svg",
-			"description": "The Eclipse IoT Working Group enables collaboration on the development of open source implementations of IoT standards and protocols, frameworks and services used by IoT solutions, and tools for IoT developers for commercial-grade IoT.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/iotwg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "598b0ec4df9dcbb23499",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-iot-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://iot.eclipse.org",
-				"members": "https://iot.eclipse.org/membership/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/iot"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"jakarta-ee": {
-			"alias": "jakarta-ee",
-			"title": "Jakarta EE Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_jakarta.png",
-			"description": "The Jakarta EE Working Group enables Java ecosystem players to collaborate on advancing enterprise Java technologies in the cloud. This initiative focuses on cultivating the business interests associated with Eclipse Enterprise for Java (EE4J) technologies.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/jakarta_ee_charter.php",
-				"participation_agreement": {
-					"individual": "",
-					"organization": "",
-					"default": ""
-				},
-				"participation_agreements": {
-					"individual": {
-						"document_id": "76ef85c1acbb4fb6d348",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-individual-working-group-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "e3985a1aead45e62ef7b",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://jakarta.ee",
-				"members": "https://jakarta.ee/membership/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership/jakarta-ee"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGDSA",
-					"description": "Enterprise Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"microprofile": {
-			"alias": "microprofile",
-			"title": "MicroProfile® Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_microprofile.svg",
-			"description": "The MicroProfile® Working Group drives the evolution and broad adoption of technologies related to the MicroProfile Project. MicroProfile is an open forum that optimizes Enterprise Java for a microservice architecture by innovating across multiple implementations and collaborating on common areas of interest with a goal of standardization.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/microprofile-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "1cb0c421ab3ddd2fbaf8",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement-individual.pdf"
-					},
-					"organization": {
-						"document_id": "8d438deac670301c236d",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://microprofile.io/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "abcde",
-					"description": "Corporate Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openadx": {
-			"alias": "openadx",
-			"title": "OpenADx Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openadx.png",
-			"description": "The OpenADx Working Group is centered around the autonomous driving toolchain and aims to bring transparency and better integration capabilities into the autonomous driving tool space.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openadx_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d0358f01f03deb7eccea",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openadx-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openadx.eclipse.org/",
-				"members": "https://openadx.eclipse.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGHIL",
-					"description": "Development Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"opengenesis": {
-			"alias": "opengenesis",
-			"title": "openGENESIS Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-opengenesis-logo.svg",
-			"description": "Before deployment onto public roads, artificial intelligence (AI) must be proven safe and roadworthy. The openGENESIS Working Group aims to foster, support and provide knowledge, methods, and tools for the assessment of AI used in autonomous driving applications.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/opengenesis_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "c282723cbb8ab2e2ed9e",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/opengenesis-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://wiki.eclipse.org/OpenGENESIS_WG",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGHIL",
-					"description": "Development Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openmdm": {
-			"alias": "openmdm",
-			"title": "openMDM Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/mdm_logo.gif",
-			"description": "The openMDM Working Group fosters and supports an open and innovative eco-system providing tools and systems, qualification kits and adapters for standardized and vendor independent management of measurement data in accordance with the ASAM ODS standard.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/mdmwg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "776731a0c98fcf80ee81",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmdm-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openmdm.org",
-				"members": "https://openmdm.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGKNA",
-					"description": "Application Member"
-				},
-				{
-					"relation": "WGJAN",
-					"description": "Service Provider Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"openmobility": {
-			"alias": "openmobility",
-			"title": "openMobility Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openmobility.png",
-			"description": "The openMobility Working Group drives the evolution and broad adoption of mobility modelling and simulation technologies.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openmobility_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "4d0545bdd64b0a98f5b2",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmobility-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openmobility.eclipse.org/",
-				"members": "https://openmobility.eclipse.org/members/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGFHA",
-					"description": "Committer Member"
-				}
-			]
-		},
-		"openpass": {
-			"alias": "openpass",
-			"title": "openPASS Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openpass.png",
-			"description": "The openPASS Working Group promotes a collaborative and innovative ecosystem by offering tools, systems, and adapters for a standardized, openly-available and vendor-neutral platform for traffic scenario simulation.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openpasswg_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "aea0514f5cc2d0407ffd",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/openpass-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://openpass.eclipse.org/",
-				"members": "https://openpass.eclipse.org/about/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGPAE",
-					"description": "Driver Member"
-				},
-				{
-					"relation": "WGJAN",
-					"description": "Service Provider Member"
-				},
-				{
-					"relation": "WGPAR",
-					"description": "User Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"osgi": {
-			"alias": "osgi",
-			"title": "OSGi Working Group ",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-osgi.png",
-			"description": "The OSGi Working Group drives the evolution and broad adoption of software technologies derived from or related to the OSGi Specification Project which is an open source initiative to create software specifications, compatible implementations and TCKs to enable development, deployment and management of embedded, server-side, and cloud-native applications by using software modularity to vastly improve the evolution, maintainability, and interoperability of applications and infrastructure.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/osgi-charter.php",
-				"participation_agreements": {
-					"individual": {
-						"document_id": "c7975e1d05ffd0a8ebe1",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-individual-participation-agreement.pdf"
-					},
-					"organization": {
-						"document_id": "68db2919ffe553250ae8",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://www.osgi.org/",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"sparkplug": {
-			"alias": "sparkplug",
-			"title": "Eclipse Sparkplug Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-sparkplug.svg",
-			"description": "The Eclipse Sparkplug Working Group drives the evolution and broad adoption of the Eclipse Sparkplug protocol and related technologies that enable the creation of open, collaborative, and interoperable Industrial IoT solutions, and a framework for supporting Industry 4.0.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/eclipse_sparkplug_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "f351fc9ba96cb468393f",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/sparkplug-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://sparkplug.eclipse.org/",
-				"members": "https://sparkplug.eclipse.org/#members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"tangle-ee": {
-			"alias": "tangle-ee",
-			"title": "Tangle EE Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_tangle-ee.svg",
-			"description": "The Tangle EE Working Group drives the adoption of IOTA's underlying network, the Tangle, and explores key IOTA use case areas including decentralized identity, data integrity and feeless payments.",
-			"resources": {
-				"charter": "",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "b4ef8fc3fefcdcda93ba",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wpga/tangle-ee-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://www.eclipse.org/org/workinggroups/tangle_ee_charter.php",
-				"members": "https://tangle.ee/members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGSD",
-					"description": "Strategic Member"
-				},
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		},
-		"gemoc": {
-			"alias": "gemoc",
-			"title": "GEMOC Research Consortium",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_gemoc-rc.png",
-			"description": "The GEMOC Research Consortium is an open and collaborative initiative which supports the development, coordination, and dissemination of the research efforts on the use and globalization of modeling languages.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/gemoc_rc_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://gemoc.org",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				}
-			]
-		},
-		"science": {
-			"alias": "science",
-			"title": "Science Working Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_science.png",
-			"description": "The Science Working Group represents a collaborative effort involving industry, academia, and government with the purpose of developing reusable open source software for scientific research",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/science_charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://science.eclipse.org",
-				"members": "https://science.eclipse.org/membership/",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership"
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				}
-			]
-		},
-		"openhw-group": {
-			"alias": "openhw-group",
-			"title": "OpenHW Group",
-			"status": "active",
-			"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openhw.svg",
-			"description": "OpenHW Group is an independent not-for-profit, global organization where hardware and software designers collaborate in the development of open-source cores, related IP, tools and software, using industry best practices. OpenHW has released its first 32bit RISC-V compliant processor core and has several processor cores in active development.",
-			"resources": {
-				"charter": "",
-				"participation_agreements": {
-					"individual": null,
-					"organization": null
-				},
-				"website": "https://www.openhwgroup.org",
-				"members": "https://www.openhwgroup.org/membership/members",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership",
-				"membership": "https://www.openhwgroup.org/membership"
-			},
-			"levels": []
-		},
-		"openhw-europe":{
-			"alias": "openhw-europe",
-			"title": "OpenHW Europe Working Group",
-			"status": "active",
-			"logo": "",
-			"description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to engage in initiatives complementing the general work program of the OpenHW Group that are of strategic interest to the joint members of Eclipse Foundation and OpenHW Group that relate to the European marketplace, including strategic market analysis, development of technical requirements, and digital sovereignty.",
-			"resources": {
-				"charter": "https://www.eclipse.org/org/workinggroups/openhw-europe-charter.php",
-				"participation_agreements": {
-					"individual": null,
-					"organization": {
-						"document_id": "d292143a3fad6b5e6ebe",
-						"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-europe-working-group-participation-agreement.pdf"
-					}
-				},
-				"website": "https://www.openhwgroup.org/europe",
-				"members": "",
-				"sponsorship": "",
-				"contact_form": "https://accounts.eclipse.org/contact/membership",
-				"membership": ""
-			},
-			"levels": [
-				{
-					"relation": "WGAPS",
-					"description": "Participant Member"
-				},
-				{
-					"relation": "WGSAP",
-					"description": "Guest Member"
-				}
-			]
-		}
-	}
+  "working_groups": {
+    "adoptium": {
+      "alias": "adoptium",
+      "title": "Adoptium Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-adoptium.svg",
+      "description": "The Adoptium Working Group promotes and supports high-quality runtimes and associated technology for use across the Java ecosystem. Our vision is to meet the needs of Eclipse and the broader Java community by providing runtimes for Java-based applications. We embrace existing standards and a wide variety of hardware and cloud platforms.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/adoptium-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "32c5a745df264aa2a809",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
+          }
+        },
+        "website": "https://adoptium.net",
+        "members": "https://adoptium.net/members.html",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGDSA",
+          "description": "Enterprise Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "asciidoc": {
+      "alias": "asciidoc",
+      "title": "AsciiDoc® Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_asciidoc.svg",
+      "description": "The AsciiDoc® Working Group drives the standardization, adoption, and evolution of AsciiDoc. This group encourages and shapes the open, collaborative development of the AsciiDoc language and its processors.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/asciidoc-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "9cc0aa80da4741eefc4c",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "df911e0adcad1a1c51df",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/asciidoc-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://asciidoc-wg.eclipse.org",
+        "members": "https://asciidoc-wg.eclipse.org/membership/members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAA",
+          "description": "Partner Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "cloud-development-tools": {
+      "alias": "cloud-development-tools",
+      "title": "Eclipse Cloud Development (ECD) Tools Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-ecd-tools.svg",
+      "description": "The Eclipse Cloud Development (ECD) Tools Working Group drives the evolution and broad adoption of de facto standards for cloud development tools, including language support, extensions, and developer workspace definition.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_cloud_development_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d96a8cabd0d04f29dfe6",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
+          }
+        },
+        "website": "https://ecdtools.eclipse.org/",
+        "members": "https://ecdtools.eclipse.org/#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/ecdtools"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "eclipse-ide": {
+      "alias": "eclipse-ide",
+      "title": "Eclipse® IDE Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_eclipse_ide.svg",
+      "description": "The Eclipse® IDE Working Group is formed to ensure the continued sustainability, integrity, evolution and adoption of the Eclipse IDE suite of products and related technologies. In particular, it is formed to provide governance, guidance, and funding for the communities that support the delivery of the Eclipse Foundation’s flagship “Eclipse IDE” products.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse-ide-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "fb4d6a3ddca7cfc1de0d",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-ide-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://ide-wg.eclipse.org",
+        "members": "https://ide-wg.eclipse.org/index.html#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://ide-wg.eclipse.org/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGIDE",
+          "description": "Supporter Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "edge-native": {
+      "alias": "edge-native",
+      "title": "Eclipse Edge Native Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-edgenative.svg",
+      "description": "The Eclipse Edge Native Working Group drives the adoption of Edge Computing technologies. It provides services like vendor-neutral marketing to the Eclipse Edge Native ecosystem and defines licensing and intellectual property flows that encourage the community to open collaboration",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_edge_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "595efa7bce8fffe3dcaf",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-edge-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://edgenative.eclipse.org/",
+        "members": "https://edgenative.eclipse.org/#members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGFVA",
+          "description": "Gold Member"
+        },
+        {
+          "relation": "WGHLP",
+          "description": "Silver Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "internet-things-iot": {
+      "alias": "internet-things-iot",
+      "title": "Eclipse IoT Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_iot.svg",
+      "description": "The Eclipse IoT Working Group enables collaboration on the development of open source implementations of IoT standards and protocols, frameworks and services used by IoT solutions, and tools for IoT developers for commercial-grade IoT.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/iotwg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "598b0ec4df9dcbb23499",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-iot-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://iot.eclipse.org",
+        "members": "https://iot.eclipse.org/membership/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/iot"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "jakarta-ee": {
+      "alias": "jakarta-ee",
+      "title": "Jakarta EE Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-jakarta.svg",
+      "description": "The Jakarta EE Working Group enables Java ecosystem players to collaborate on advancing enterprise Java technologies in the cloud. This initiative focuses on cultivating the business interests associated with Eclipse Enterprise for Java (EE4J) technologies.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/jakarta_ee_charter.php",
+        "participation_agreement": {
+          "individual": "",
+          "organization": "",
+          "default": ""
+        },
+        "participation_agreements": {
+          "individual": {
+            "document_id": "76ef85c1acbb4fb6d348",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-individual-working-group-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "e3985a1aead45e62ef7b",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/jakarta-ee-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://jakarta.ee",
+        "members": "https://jakarta.ee/membership/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership/jakarta-ee"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGDSA",
+          "description": "Enterprise Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "microprofile": {
+      "alias": "microprofile",
+      "title": "MicroProfile® Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_microprofile.svg",
+      "description": "The MicroProfile® Working Group drives the evolution and broad adoption of technologies related to the MicroProfile Project. MicroProfile is an open forum that optimizes Enterprise Java for a microservice architecture by innovating across multiple implementations and collaborating on common areas of interest with a goal of standardization.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/microprofile-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "1cb0c421ab3ddd2fbaf8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement-individual.pdf"
+          },
+          "organization": {
+            "document_id": "8d438deac670301c236d",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/microprofile-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://microprofile.io/",
+        "members": "https://microprofile.io/workinggroup/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "abcde",
+          "description": "Corporate Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openadx": {
+      "alias": "openadx",
+      "title": "OpenADx Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openadx.svg",
+      "description": "The OpenADx Working Group is centered around the autonomous driving toolchain and aims to bring transparency and better integration capabilities into the autonomous driving tool space.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openadx_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d0358f01f03deb7eccea",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openadx-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openadx.eclipse.org/",
+        "members": "https://openadx.eclipse.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGHIL",
+          "description": "Development Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "opengenesis": {
+      "alias": "opengenesis",
+      "title": "openGENESIS Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-opengenesis-logo.svg",
+      "description": "Before deployment onto public roads, artificial intelligence (AI) must be proven safe and roadworthy. The openGENESIS Working Group aims to foster, support and provide knowledge, methods, and tools for the assessment of AI used in autonomous driving applications.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/opengenesis_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "c282723cbb8ab2e2ed9e",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/opengenesis-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://wiki.eclipse.org/OpenGENESIS_WG",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGHIL",
+          "description": "Development Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openmdm": {
+      "alias": "openmdm",
+      "title": "openMDM Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openmdm.svg",
+      "description": "The openMDM Working Group fosters and supports an open and innovative eco-system providing tools and systems, qualification kits and adapters for standardized and vendor independent management of measurement data in accordance with the ASAM ODS standard.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/mdmwg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "776731a0c98fcf80ee81",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmdm-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openmdm.org",
+        "members": "https://openmdm.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGKNA",
+          "description": "Application Member"
+        },
+        {
+          "relation": "WGJAN",
+          "description": "Service Provider Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openmobility": {
+      "alias": "openmobility",
+      "title": "openMobility Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openmobility.svg",
+      "description": "The openMobility Working Group drives the evolution and broad adoption of mobility modelling and simulation technologies.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openmobility_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "4d0545bdd64b0a98f5b2",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openmobility-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openmobility.eclipse.org/",
+        "members": "https://openmobility.eclipse.org/members/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        }
+      ]
+    },
+    "openpass": {
+      "alias": "openpass",
+      "title": "openPASS Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openpass.svg",
+      "description": "The openPASS Working Group promotes a collaborative and innovative ecosystem by offering tools, systems, and adapters for a standardized, openly-available and vendor-neutral platform for traffic scenario simulation.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openpasswg_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "aea0514f5cc2d0407ffd",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/openpass-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://openpass.eclipse.org/",
+        "members": "https://openpass.eclipse.org/about/#members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGPAE",
+          "description": "Driver Member"
+        },
+        {
+          "relation": "WGJAN",
+          "description": "Service Provider Member"
+        },
+        {
+          "relation": "WGPAR",
+          "description": "User Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "osgi": {
+      "alias": "osgi",
+      "title": "OSGi Working Group ",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-osgi.png",
+      "description": "The OSGi Working Group drives the evolution and broad adoption of software technologies derived from or related to the OSGi Specification Project which is an open source initiative to create software specifications, compatible implementations and TCKs to enable development, deployment and management of embedded, server-side, and cloud-native applications by using software modularity to vastly improve the evolution, maintainability, and interoperability of applications and infrastructure.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/osgi-charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "c7975e1d05ffd0a8ebe1",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "68db2919ffe553250ae8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/osgi-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://www.osgi.org/",
+        "members": "https://www.eclipse.org/org/workinggroups/members.php?wg=osgi",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "sparkplug": {
+      "alias": "sparkplug",
+      "title": "Eclipse Sparkplug Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-sparkplug.svg",
+      "description": "The Eclipse Sparkplug Working Group drives the evolution and broad adoption of the Eclipse Sparkplug protocol and related technologies that enable the creation of open, collaborative, and interoperable Industrial IoT solutions, and a framework for supporting Industry 4.0.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/eclipse_sparkplug_charter.php",
+        "participation_agreements": {
+          "individual": {
+            "document_id": "0186c51ccfa2bc7dbbe8",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/sparkplug-working-group-individual-participation-agreement.pdf"
+          },
+          "organization": {
+            "document_id": "f351fc9ba96cb468393f",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/sparkplug-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://sparkplug.eclipse.org/",
+        "members": "https://sparkplug.eclipse.org/#members",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "gemoc": {
+      "alias": "gemoc",
+      "title": "GEMOC Research Consortium",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_gemoc-rc.png",
+      "description": "The GEMOC Research Consortium is an open and collaborative initiative which supports the development, coordination, and dissemination of the research efforts on the use and globalization of modeling languages.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/gemoc_rc_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://gemoc.org",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        }
+      ]
+    },
+    "science": {
+      "alias": "science",
+      "title": "Science Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_science.png",
+      "description": "The Science Working Group represents a collaborative effort involving industry, academia, and government with the purpose of developing reusable open source software for scientific research",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/science_charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://science.eclipse.org",
+        "members": "https://science.eclipse.org/membership/",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        }
+      ]
+    },
+    "openhw-group": {
+      "alias": "openhw-group",
+      "title": "OpenHW Group",
+      "status": "active",
+      "parent_organization": "ohwg",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg_openhw.svg",
+      "description": "OpenHW Group is an independent not-for-profit, global organization where hardware and software designers collaborate in the development of open-source cores, related IP, tools and software, using industry best practices. OpenHW has released its first 32bit RISC-V compliant processor core and has several processor cores in active development.",
+      "resources": {
+        "charter": "",
+        "participation_agreements": {
+          "individual": null,
+          "organization": null
+        },
+        "website": "https://www.openhwgroup.org",
+        "members": "https://www.openhwgroup.org/membership/members",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership",
+        "membership": "https://www.openhwgroup.org/membership"
+      },
+      "levels": []
+    },
+    "oniro": {
+      "alias": "oniro",
+      "title": "Oniro Working Group",
+      "status": "active",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-oniro.png",
+      "description": "The Oniro Working Group will foster an ecosystem of organizations that supports the community in the production and evolution of the Oniro operating system and platform. Oniro is a new commercially oriented, modular, and multikernel open source software platform. Its ecosystem will be developed in an environment where collaboration is promoted via the core Eclipse Foundation principles of vendor-neutrality, transparency, and openness.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/oniro-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "f348c2873ca8ed8e9eca",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wpga/oniro-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://oniroproject.org/",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGFVA",
+          "description": "Gold Member"
+        },
+        {
+          "relation": "WGHLP",
+          "description": "Silver Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openhw-asia": {
+      "alias": "openhw-asia",
+      "title": "OpenHW Asia Working Group",
+      "status": "proposed",
+      "parent_organization": "ohwg",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openhw-asia.svg",
+      "description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to address Asia-focused initiatives complementing the work program of the OpenHW Group. Those initiatives may address strategic or market analysis, technical requirements, and digital sovereignty.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openhw-asia-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "a3f1857c324e91b7f05f",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-asia-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "openhw-europe": {
+      "alias": "openhw-europe",
+      "title": "OpenHW Europe Working Group",
+      "status": "active",
+      "parent_organization": "ohwg",
+      "logo": "",
+      "description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to engage in initiatives complementing the general work program of the OpenHW Group that are of strategic interest to the joint members of Eclipse Foundation and OpenHW Group that relate to the European marketplace, including strategic market analysis, development of technical requirements, and digital sovereignty.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/openhw-europe-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "d292143a3fad6b5e6ebe",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-europe-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://www.openhwgroup.org/europe",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership",
+        "membership": ""
+      },
+      "levels": [
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "aice": {
+      "alias": "aice",
+      "title": "Eclipse AI, Cloud & Edge (AICE) Working Group",
+      "status": "proposed",
+      "parent_organization": "eclipse",
+      "logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-aice.svg",
+      "description": "The Eclipse AI, Cloud & Edge (AICE) Working Group will manage and operate an open lab (the “AICE OpenLab”) that will provide a set of resources to promote the advancement, implementation, and verification of open source software for AI, Cloud, and Edge computing.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/aice-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "a8bc59bfcd17d5a42f1e",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/aice-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://aice.eclipse.org/",
+        "members": "",
+        "sponsorship": "",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    },
+    "sdv": {
+      "alias": "sdv",
+      "title": "Software Defined Vehicle Working Group",
+      "status": "proposed",
+      "parent_organization": "eclipse",
+      "logo": "",
+      "description": "The Eclipse Software Defined Vehicle (SDV) Working Group will provide a forum for individuals and organizations to build and promote open source software, specifications, and open collaboration models needed to create a scalable, modular, extensible, industry-ready open source licensed vehicle software platform to support in-vehicle and around the vehicle applications development and deployment.",
+      "resources": {
+        "charter": "https://www.eclipse.org/org/workinggroups/sdv-charter.php",
+        "participation_agreements": {
+          "individual": null,
+          "organization": {
+            "document_id": "fbb9be0bc283dc584b23",
+            "pdf": "https://www.eclipse.org/org/workinggroups/wgpa/sdv-working-group-participation-agreement.pdf"
+          }
+        },
+        "website": "https://sdv.eclipse.org/",
+        "members": "",
+        "sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
+        "contact_form": "https://accounts.eclipse.org/contact/membership"
+      },
+      "levels": [
+        {
+          "relation": "WGSD",
+          "description": "Strategic Member"
+        },
+        {
+          "relation": "WGAPS",
+          "description": "Participant Member"
+        },
+        {
+          "relation": "WGFHA",
+          "description": "Committer Member"
+        },
+        {
+          "relation": "WGSM",
+          "description": "Supporting Member"
+        },
+        {
+          "relation": "WGSAP",
+          "description": "Guest Member"
+        }
+      ]
+    }
+  }
 }
diff --git a/src/main/k8s/production.yml b/src/main/k8s/production.yml
index f8e41c74b16cbf6705ba92a166c149990a14d685..300a7ac7c8e31f81119ca6e70611906ee24f840d 100644
--- a/src/main/k8s/production.yml
+++ b/src/main/k8s/production.yml
@@ -43,7 +43,7 @@ spec:
             memory: 384Mi
         env:
         - name: CONFIG_SECRET_PATH
-          value: "/run/secrets/react-membership-app/secret.properties"
+          value: "/run/secrets/eclipsefdn-membership-portal/secret.properties"
         volumeMounts:
         - name: portal-secret-properties
           mountPath: "/run/secrets/eclipsefdn-membership-portal"
@@ -100,7 +100,7 @@ spec:
 apiVersion: "v1"
 kind: "Service"
 metadata:
-  name: eclipsefdn-membership-portal-staging
+  name: eclipsefdn-membership-portal
   namespace: foundation-internal-webdev-apps
 spec:
   ports:
@@ -110,12 +110,12 @@ spec:
     targetPort: 8092
   selector:
     app: eclipsefdn-react-membership
-    environment: staging
+    environment: production
 ---
 apiVersion: "v1"
 kind: "Service"
 metadata:
-  name: eclipsefdn-membership-application-staging
+  name: eclipsefdn-membership-application
   namespace: foundation-internal-webdev-apps
 spec:
   ports:
@@ -125,7 +125,7 @@ spec:
     targetPort: 8093
   selector:
     app: eclipsefdn-react-membership
-    environment: staging
+    environment: production
 ---
 apiVersion: "route.openshift.io/v1"
 kind: "Route"
diff --git a/src/main/www/src/Constants/Constants.js b/src/main/www/src/Constants/Constants.js
index 048b5373681599d94d127c335406cca180e18d25..4dbfbf1957d9de687114409781c91306c3f0a5e3 100644
--- a/src/main/www/src/Constants/Constants.js
+++ b/src/main/www/src/Constants/Constants.js
@@ -158,6 +158,7 @@ export const END_POINT = {
   activity_yearly: 'activity/yearly',
   contacts: 'contacts',
   working_groups: 'working_groups',
+  working_groups_eclipse: 'working_groups?parent_organization=eclipse&status=proposed&status=active',
   userinfo: 'userinfo',
   complete: 'complete',
   resources: 'https://newsroom.eclipse.org/api/resources?pagesize=60&page=',
diff --git a/src/main/www/src/components/Application/WorkingGroups/WorkingGroupsWrapper.js b/src/main/www/src/components/Application/WorkingGroups/WorkingGroupsWrapper.js
index a196eae79cce2d8f3c53852f054a45ae3f7599b7..e43cf305562ad63c4ae398224d53a21396eeda01 100644
--- a/src/main/www/src/components/Application/WorkingGroups/WorkingGroupsWrapper.js
+++ b/src/main/www/src/components/Application/WorkingGroups/WorkingGroupsWrapper.js
@@ -224,7 +224,7 @@ export const fetchAvailableFullWorkingGroupList = (setFullWorkingGroupList) => {
     url_prefix_local = api_prefix() + '/';
   }
 
-  fetch(url_prefix_local + END_POINT.working_groups, {
+  fetch(url_prefix_local + END_POINT.working_groups_eclipse, {
     headers: FETCH_HEADER,
   })
     .then((res) => {