diff --git a/generators/cmd/sigs/sig-list.gomd b/generators/cmd/sigs/sig-list.gomd
index 601c41a3..22005e81 100644
--- a/generators/cmd/sigs/sig-list.gomd
+++ b/generators/cmd/sigs/sig-list.gomd
@@ -19,7 +19,7 @@
     */
 -}}
 {{- /* gotype: kubevirt.io/community/generators/cmd/sigs.SigListTemplateData */ -}}
-{{ define "group" }}|[{{ .Name }}]({{ .Dir }}/charter.md) |[{{ .Label }}](https://github.com/kubevirt/kubevirt/labels/{{ .Label }})|{{ if .Leadership }}<ol>{{ range $index2, $chair := .Leadership.Chairs }}<li>[{{ $chair.Name }}](https://github.com/{{ $chair.Github }}), {{ $chair.Company }}</li>{{ end }}</ol>{{ end }} |{{ if .Contact }}[Slack]({{ .Contact.Slack}})<br/> [Mailing List]({{ .Contact.MailingList }}){{ end }} |<ul>{{ range $index3, $meeting := .Meetings }}<li>{{ $meeting.Description }}: [ {{ $meeting.Day }} at {{ $meeting.Time }} {{ $meeting.TZ }} ({{ $meeting.Frequency }}) ]({{ $meeting.URL }})</li>{{ end }}</ul> |{{ end }}
+{{ define "group" }}|[{{ .Name }}]({{ .Dir }}/charter.md) |{{ if .Label }}[{{ .Label }}](https://github.com/kubevirt/kubevirt/labels/{{ .Label }}){{ end }} | {{ if .Leadership }}<ol>{{ range $index2, $chair := .Leadership.Chairs }}<li>[{{ $chair.Name }}](https://github.com/{{ $chair.Github }}), {{ $chair.Company }}</li>{{ end }}</ol>{{ end }} |{{ if .Contact }}[Slack]({{ .Contact.Slack}})<br/> [Mailing List]({{ .Contact.MailingList }}){{ end }} |<ul>{{ range $index3, $meeting := .Meetings }}<li>{{ $meeting.Description }}: [ {{ $meeting.Day }} at {{ $meeting.Time }} {{ $meeting.TZ }} ({{ $meeting.Frequency }}) ]({{ $meeting.URL }})</li>{{ end }}</ul> |{{ end }}
 <!---
 This is an autogenerated file!
 
@@ -41,7 +41,7 @@ Each group's material is in its subdirectory in this project.
 ### User Groups
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
-|------|-----------|---------|---------|----------|
+|------|-----------|------------|---------|----------|
 {{ range $ug := $.Sigs.Usergroups }}{{ template "group" $ug }}
 {{ end }}
 {{ end }}
@@ -50,16 +50,25 @@ Each group's material is in its subdirectory in this project.
 ### Special Interest Groups
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
-|------|-----------|---------|---------|----------|
+|------|-----------|------------|---------|----------|
 {{ range $sig := $.Sigs.Sigs }}{{ template "group" $sig }}
 {{ end }}
 {{end}}
 
+{{ if $.Sigs.Workinggroups }}
+### Working Groups
+
+| Name | Label [1] | Chairs [2] | Contact | Meetings |
+|------|-----------|------------|---------|----------|
+{{ range $wg := $.Sigs.Workinggroups }}{{ template "group" $wg }}
+{{ end }}
+{{end}}
+
 {{ if $.Sigs.Committees }}
 ### Committees
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
-|------|-----------|---------|---------|----------|
+|------|-----------|------------|---------|----------|
 {{ range $committee := $.Sigs.Committees }}{{ template "group" $committee }}
 {{ end }}
 {{end}}
diff --git a/pkg/sigs/types.go b/pkg/sigs/types.go
index ab7bb2bf..d379e043 100644
--- a/pkg/sigs/types.go
+++ b/pkg/sigs/types.go
@@ -20,26 +20,28 @@
 package sigs
 
 type Sigs struct {
-	Sigs       []*Group `yaml:"sigs"`
-	Usergroups []*Group `yaml:"usergroups"`
-	Committees []*Group `yaml:"committees"`
+	Sigs          []*Group `yaml:"sigs"`
+	Workinggroups []*Group `yaml:"workinggroups"`
+	Usergroups    []*Group `yaml:"usergroups"`
+	Committees    []*Group `yaml:"committees"`
 }
 
 type Group struct {
 	Dir              string
 	Name             string
-	MissionStatement string         `yaml:"mission_statement,omitempty"`
-	Label            string         `yaml:",omitempty"`
-	Leadership       *Leadership    `yaml:",omitempty"`
-	Meetings         []*Meeting     `yaml:",omitempty"`
-	Contact          *Contact       `yaml:",omitempty"`
-	SubProjects      []*SubProjects `yaml:",omitempty"`
+	MissionStatement string        `yaml:"mission_statement,omitempty"`
+	Label            string        `yaml:",omitempty"`
+	Leadership       *Leadership   `yaml:",omitempty"`
+	Meetings         []*Meeting    `yaml:",omitempty"`
+	Contact          *Contact      `yaml:",omitempty"`
+	SubProjects      []*SubProject `yaml:",omitempty"`
 }
 
 type Contact struct {
-	Slack       string  `yaml:"slack"`
-	MailingList string  `yaml:"mailing_list"`
-	Teams       []*Team `yaml:"teams"`
+	Slack       string     `yaml:"slack"`
+	MailingList string     `yaml:"mailing_list"`
+	Teams       []*Team    `yaml:"teams"`
+	Liaison     *OrgMember `yaml:"liaison"`
 }
 
 type Team struct {
@@ -59,16 +61,18 @@ type Meeting struct {
 }
 
 type Leadership struct {
-	Chairs []*Chair
+	Chairs []*OrgMember
 }
 
-type Chair struct {
+type OrgMember struct {
 	Github  string
 	Name    string
-	Company string
+	Company string `yaml:",omitempty"`
 }
 
-type SubProjects struct {
-	Name   string
-	Owners []string
+type SubProject struct {
+	Name        string
+	Description string `yaml:",omitempty"`
+	Owners      []string
+	Leads       []*OrgMember `yaml:",omitempty"`
 }
diff --git a/sig-list.md b/sig-list.md
index 029e9641..8e3ef26c 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -20,8 +20,8 @@ Each group's material is in its subdirectory in this project.
 ### User Groups
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
-|------|-----------|---------|---------|----------|
-|[KubeVirt Community](kubevirt-community/charter.md) |[](https://github.com/kubevirt/kubevirt/labels/)|<ol></ol> |[Slack](virtualization)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>Regular KubeVirt Community Meeting: [ Wednesday at 15:00 UTC (weekly) ](https://zoom.us/j/92221936273)</li></ul> |
+|------|-----------|------------|---------|----------|
+|[KubeVirt Community](kubevirt-community/charter.md) | | <ol></ol> |[Slack](virtualization)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>Regular KubeVirt Community Meeting: [ Wednesday at 15:00 UTC (weekly) ](https://zoom.us/j/92221936273)</li></ul> |
 
 
 
@@ -29,16 +29,26 @@ Each group's material is in its subdirectory in this project.
 ### Special Interest Groups
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
-|------|-----------|---------|---------|----------|
-|[sig-compute](sig-compute/charter.md) |[sig/compute](https://github.com/kubevirt/kubevirt/labels/sig/compute)|<ol><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li><li>[Jed Lejosne](https://github.com/jean-edouard), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul></ul> |
-|[documentation](sig-documentation/charter.md) |[sig/documentation](https://github.com/kubevirt/kubevirt/labels/sig/documentation)| | |<ul></ul> |
-|[storage](sig-storage/charter.md) |[sig/storage](https://github.com/kubevirt/kubevirt/labels/sig/storage)| | |<ul></ul> |
-|[testing](sig-testing/charter.md) |[sig/testing](https://github.com/kubevirt/kubevirt/labels/sig/testing)| | |<ul></ul> |
-|[network](sig-network/charter.md) |[sig/network](https://github.com/kubevirt/kubevirt/labels/sig/network)| | |<ul></ul> |
-|[KubeVirt Perf and Scale SIG](sig-scale/charter.md) |[sig/scale](https://github.com/kubevirt/kubevirt/labels/sig/scale)|<ol><li>[Ryan Hallisey](https://github.com/rthallisey), Nvidia</li><li>[Alay Patel](https://github.com/alaypatel07), Nvidia</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Perf and Scale SIG Meeting: [ Thursday at 14:00 UTC (bimonthy) ](https://zoom.us/j/3205945033)</li></ul> |
-|[observability](sig-observability/charter.md) |[sig/observability](https://github.com/kubevirt/kubevirt/labels/sig/observability)| | |<ul></ul> |
-|[KubeVirt Buildsystem SIG](sig-buildsystem/charter.md) |[sig/buildsystem](https://github.com/kubevirt/kubevirt/labels/sig/buildsystem)|<ol><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Luboslav Pivarc](https://github.com/xpivarc), Red Hat</li></ol> | |<ul></ul> |
-|[KubeVirt CI Operations Group](sig-ci/charter.md) |[sig/ci](https://github.com/kubevirt/kubevirt/labels/sig/ci)|<ol><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt CI Taskforce Sync meeting: [ Monday at 09:00 CET (weekly) ](https://zoom.us/j/96583958896)</li><li>KubeVirt tests quarantine catch-up: [ Wednesday at 08:45 CET (weekly) ](https://zoom.us/j/94552009485)</li></ul> |
+|------|-----------|------------|---------|----------|
+|[sig-compute](sig-compute/charter.md) |[sig/compute](https://github.com/kubevirt/kubevirt/labels/sig/compute) | <ol><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li><li>[Jed Lejosne](https://github.com/jean-edouard), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul></ul> |
+|[documentation](sig-documentation/charter.md) |[sig/documentation](https://github.com/kubevirt/kubevirt/labels/sig/documentation) |  | |<ul></ul> |
+|[storage](sig-storage/charter.md) |[sig/storage](https://github.com/kubevirt/kubevirt/labels/sig/storage) |  | |<ul></ul> |
+|[testing](sig-testing/charter.md) |[sig/testing](https://github.com/kubevirt/kubevirt/labels/sig/testing) |  | |<ul></ul> |
+|[network](sig-network/charter.md) |[sig/network](https://github.com/kubevirt/kubevirt/labels/sig/network) |  | |<ul></ul> |
+|[KubeVirt Perf and Scale SIG](sig-scale/charter.md) |[sig/scale](https://github.com/kubevirt/kubevirt/labels/sig/scale) | <ol><li>[Ryan Hallisey](https://github.com/rthallisey), Nvidia</li><li>[Alay Patel](https://github.com/alaypatel07), Nvidia</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Perf and Scale SIG Meeting: [ Thursday at 14:00 UTC (bimonthy) ](https://zoom.us/j/3205945033)</li></ul> |
+|[observability](sig-observability/charter.md) |[sig/observability](https://github.com/kubevirt/kubevirt/labels/sig/observability) |  | |<ul></ul> |
+|[KubeVirt Buildsystem SIG](sig-buildsystem/charter.md) |[sig/buildsystem](https://github.com/kubevirt/kubevirt/labels/sig/buildsystem) | <ol><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Luboslav Pivarc](https://github.com/xpivarc), Red Hat</li></ol> | |<ul></ul> |
+|[KubeVirt CI Operations Group](sig-ci/charter.md) |[sig/ci](https://github.com/kubevirt/kubevirt/labels/sig/ci) | <ol><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt CI Taskforce Sync meeting: [ Monday at 09:00 CET (weekly) ](https://zoom.us/j/96583958896)</li><li>KubeVirt tests quarantine catch-up: [ Wednesday at 08:45 CET (weekly) ](https://zoom.us/j/94552009485)</li></ul> |
+
+
+
+
+### Working Groups
+
+| Name | Label [1] | Chairs [2] | Contact | Meetings |
+|------|-----------|------------|---------|----------|
+|[S390x architecture working group](wg-arch-s390x/charter.md) |[wg-arch-s390x](https://github.com/kubevirt/kubevirt/labels/wg-arch-s390x) | <ol><li>[Jan Schintag](https://github.com/jschintag), IBM</li><li>[Cheryl Fillekes](https://github.com/cfilleke), IBM</li><li>[vamsikrishna-siddu](https://github.com/vamsikrishna-siddu), IBM</li></ol> | |<ul></ul> |
+|[ARM architecture working group](wg-arch-arm/charter.md) |[wg-arch-arm](https://github.com/kubevirt/kubevirt/labels/wg-arch-arm) | <ol><li>[Howard Zhang](https://github.com/zhlhahaha), ARM</li></ol> | |<ul></ul> |