kernelci · bhcopeland · Aug 7, 2026
diff --git a/kernelci.org/.gitattributes b/kernelci.org/.gitattributes
@@ -14,6 +14,7 @@ content/en/background.jpeg filter=lfs diff=lfs merge=lfs -text
 content/en/about/background.jpeg filter=lfs diff=lfs merge=lfs -text
 static/files/KernelCI_Participation_Agreement_and_Funding_Charter_20180913.pdf filter=lfs diff=lfs merge=lfs -text
 static/files/KernelCI_Project_Technical_Charter_20181107.pdf filter=lfs diff=lfs merge=lfs -text
+static/files/KernelCI_Project_Technical_Charter_202607.pdf filter=lfs diff=lfs merge=lfs -text
 content/en/logo/files/kernelci-logo-color.png filter=lfs diff=lfs merge=lfs -text
 content/en/logo/files/kernelci-logo-color.svg filter=lfs diff=lfs merge=lfs -text
 content/en/logo/files/kernelci-logo-white.svg filter=lfs diff=lfs merge=lfs -text

diff --git a/kernelci.org/content/en/org/_index.md b/kernelci.org/content/en/org/_index.md
@@ -94,8 +94,17 @@ has been established as KernelCI Project a Series of LF Projects, LLC (the
 liability company. All Contributors to the Project must comply with the terms
 of this Charter.
 
-[KernelCI_Project_Technical_Charter_20181107.pdf
-](/files/KernelCI_Project_Technical_Charter_20181107.pdf)
+The Charter was amended in July 2026 to reset the composition of the
+[Technical Steering Committee](tsc), to establish the Infrastructure Committee
+as a body of the Project and to define the Contributor and Committer roles.
+
+[KernelCI_Project_Technical_Charter_202607.pdf
+](/files/KernelCI_Project_Technical_Charter_202607.pdf)
+
+Superseded versions are kept for reference:
+
+* [KernelCI_Project_Technical_Charter_20181107.pdf
+  ](/files/KernelCI_Project_Technical_Charter_20181107.pdf)
 
 ## Meetings
 
@@ -142,6 +151,8 @@ private meeting as only member representatives can attend.
 * Every second Thursday of the month at 10:00 UTC
 
 The [Technical Steering Committee](/org/tsc/) meet once a month to discuss
-general technical topics that have a significant impact on the project.  This
-is a private meeting as only elected TSC members can attend and they
-occasionally take part in decisions made by the advisory board.
+general technical topics that have a significant impact on the project.  As per
+the Technical Charter, TSC meetings are intended to be open to the public and
+may be conducted electronically, via teleconference or in person.  Anyone may
+attend, but only voting members take part in votes.  The TSC also occasionally
+take part in decisions made by the advisory board.
diff --git a/kernelci.org/content/en/org/tsc/_index.md b/kernelci.org/content/en/org/tsc/_index.md
@@ -10,7 +10,7 @@ aliases:
 The Technical Steering Committee (TSC) is a team of people who are responsible
 for keeping the KernelCI project in a good shape and driving its development.
 The [rules](#rules) are based on the LF [project
-charter](/files/KernelCI_Project_Technical_Charter_20181107.pdf).  Typically,
+charter](/files/KernelCI_Project_Technical_Charter_202607.pdf).  Typically,
 major contributors eventually become members and those who have stopped
 contributing for an extended period of time may be removed.
 
@@ -29,7 +29,12 @@ respective email address and IRC nicknames:
 
 
 With the exception of the Infra Committee representative the term of the current
-members lasts for an year, finishing at October 31th, 2026.
+members lasts for a year, finishing at October 31st, 2026.
+
+The Technical Charter as amended in July 2026 sets the TSC at three voting
+members determined by election plus the Infrastructure Lead.  The members listed
+above hold their seats until the end of the current term; the reduced
+composition takes effect from the next election.
 
 
 ## Communication
@@ -45,18 +50,25 @@ including votes when necessary. See the [community calendar](https://kernelci.or
 
 ### Votes
 
-As per paragraph *3.a TSC Voting* of the [project
-charter](/files/KernelCI_Project_Technical_Charter_20181107.pdf):
+As per paragraph *4.a Committee Voting* of the [project
+charter](/files/KernelCI_Project_Technical_Charter_202607.pdf):
 
-> While the Project aims to operate as a consensus based community, if any TSC
-> decision requires a vote to move the Project forward, the voting members of
-> the TSC will vote on a one vote per voting member basis.
+> While the Project aims to operate as a consensus based community, if any
+> committee decision requires a vote to move the Project forward, the voting
+> members of the applicable committee will vote on a one vote per voting member
+> basis.
 
 Decisions that always require a vote are:
 * adding or removing TSC members
+* electing or replacing the TSC Chair
 * making changes to the TSC rules
 * granting or removing any kind of admin rights to individuals
 * making proposals to the LF project board
+* amending the Technical Charter
+
+Replacing the TSC Chair requires a two-thirds vote of the TSC.  Amending the
+Technical Charter requires a two-thirds vote of the entire TSC and is subject to
+approval by LF Projects.
 
 Votes are made on motions with a yes/no choice and have to be proposed by a TSC
 member.  The result of each vote should be shared on the mailing list and added
@@ -78,6 +90,9 @@ majority of "yes" votes from the whole TSC hasn't been reached by then.
 Because our members are spread across the world, and normally cannot attend a
 meeting all at once, the preferred approach is to vote by email.
 
+If a vote cannot be resolved by the TSC, any voting member may refer the matter
+to the LF Projects Series Manager for assistance in reaching a resolution.
+
 Abstentions are not counted as votes.  Effectively, they are the same as not
 attending a meeting or not replying to an email.  For example, with 7 TSC
 members in a meeting, if 3 are abstaining, 3 vote "yes" and 1 votes "no", we
@@ -86,20 +101,23 @@ motion is moved.
 
 ### Members
 
+The voting members of the TSC are three members determined by election plus the
+Infrastructure Lead.  The Infrastructure Lead is elected jointly by the voting
+members of the TSC and of the [Infrastructure
+Committee](/org/working-groups/#infrastructure-committee) for a two-year term.
+
 The elections for the TSC happens every year, so the members term last for
-one year (except the Infrastructure Committee Lead that is appointed by
-Charter rules).
+one year (except the Infrastructure Lead, whose term is set by Charter rules).
+A TSC member may run for re-election and serve successive terms.
 
 Current members of the TSC may propose to vote for new people to be added or
 removed. The term of new members voted in directly by the TSC will last
 until the end of the term of the community-elected members.
 
-At the time new elections should happen, then numbers of spots should be
-the numbers of current TSC members minus one (to account for the Infrastructure
-Committee Lead).
-
-No more than 2 members from the same organization should be in the
-TSC.
+Each TSC member has one vote.  Where two or more members are employed by the
+same company or group of related companies, those members are limited to one
+vote between them, and the TSC will promptly hold elections to fill the
+resulting vacancy.
 
 People to be considered as new TSC members should have typically played an
 important role for a significant amount of time in the project.  There is
@@ -116,6 +134,22 @@ it's up to the TSC to vote and judge whether a member should be removed due to
 inactivity.  Members who commit acts that pose a threat to the stability of the
 project may also be removed following a TSC vote.
 
+### Chair
+
+The TSC elects a Chair from among its own voting members.  The Chair presides
+over meetings of the TSC and serves for a period of one year, or until their
+resignation or replacement by the TSC.
+
+The Chair, or any other TSC member so designated by the TSC, is the primary
+communication contact between the Project and the KernelCI Initiative Fund of
+The Linux Foundation, and holds the TSC seat on the [Advisory
+Board](/org/board/).
+
+The Charter does not state in so many words that the Chair must be a TSC
+member, but paragraph *2.i* refers to "the TSC Chair, or any other TSC member
+so designated by the TSC", which only reads sensibly if the Chair is one of
+them.
+
 ### Duties
 
 Each TSC member is responsible for taking part in making important technical

diff --git a/kernelci.org/content/en/org/working-groups.md b/kernelci.org/content/en/org/working-groups.md
@@ -17,9 +17,18 @@ as:
 * sharing regular reports with the TSC, board and public mailing list
 
 
-## Infra WG
-
-Formally known as the Infrastructure Committee, this group drives the infrastructure development of KernelCI, translating community requirements to system features. This group also drives Sysadmin team.
+## Infrastructure Committee
+
+The Infrastructure Committee is a body of the project defined in section 3 of
+the [Technical Charter](/files/KernelCI_Project_Technical_Charter_202607.pdf)
+rather than an ordinary working group.  It consists of the contributors
+responsible for the development, deployment and maintenance of the software
+projects operated as KernelCI services, including but not limited to Maestro,
+KCIDB, Storage and the Web Dashboard.  It drives the infrastructure development
+of KernelCI, translating community requirements to system features.  The
+[SysAdmin](#sysadmin) team functions as a sub-team within the committee, and
+access to system administration secrets is granted to designated members of that
+sub-team as required.
 
 **Mailing list:** [kernelci@lists.linux.dev](mailto:<kernelci@lists.linux.dev>)
 
@@ -34,8 +43,30 @@ Formally known as the Infrastructure Committee, this group drives the infrastruc
 * [Paweł Wieczorek](mailto:<pawiecz@collabora.com>)
 * [Tales Aparecida](mailto:<tales.aparecida@redhat.com>)
 
-The infrastructure WG is regulated by the KernelCI Technical Charter. Rules can be changed through
-TSC approval and documented in this git repo.
+The initial membership was set by the [2025-07-30 TSC
+vote](/org/tsc/votes/#2025-07-30).
+
+The committee is responsible for:
+
+* overseeing the reliable operation, maintenance and continuous improvement of
+  the KernelCI infrastructure services
+* managing the SysAdmin sub-team and defining procedures for secure access and
+  operational best practices
+* supporting the development and deployment of new infrastructure components
+  aligned with the project's technical roadmap
+* defining and maintaining policies for secure and efficient service operation
+
+The committee may vote to add or remove members at any time by a simple majority
+vote.  Any member who has not actively contributed to the relevant
+infrastructure projects for more than six consecutive months is automatically
+removed from the committee.
+
+The voting members of the TSC and of the Infrastructure Committee together elect
+an Infrastructure Committee Lead (the "Infrastructure Lead") from among the
+voting members of the committee, to serve a two-year term.  The Infrastructure
+Lead is also a voting member of the [TSC](/org/tsc/).
+
+Rules can be changed through TSC approval and documented in this git repo.
 
 ## Web dashboard
 

diff --git a/kernelci.org/static/files/KernelCI_Project_Technical_Charter_202607.pdf b/kernelci.org/static/files/KernelCI_Project_Technical_Charter_202607.pdf