From 6334db4052ccc0c5bb3e06d56dcb5d377bf76c50 Mon Sep 17 00:00:00 2001
From: Noah Litov <noahlitov@gmail.com>
Date: Tue, 25 Feb 2020 12:41:28 -0800
Subject: [PATCH 1/3] add team members to merge rules

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index ad91ea47f171e..c7536656d9694 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -6,7 +6,7 @@ pull_request_rules:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|NetaNir|illapolo)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:

From 9271d9da7b381369ba05cfac3fa29e68b3152bb3 Mon Sep 17 00:00:00 2001
From: Noah Litov <noahlitov@gmail.com>
Date: Tue, 25 Feb 2020 12:42:54 -0800
Subject: [PATCH 2/3] add team members to merge rules

---
 .mergify.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index c7536656d9694..5d12200567222 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -75,6 +75,8 @@ pull_request_rules:
       - author!=NGL321
       - author!=Jerry-AWS
       - author!=SomayaB
+      - author!=NetaNir
+      - author!=illapolo
       - base=master
       - -merged
       - -closed

From 79dc67321eacae5883358fb5e9dbac23d2a1d924 Mon Sep 17 00:00:00 2001
From: Noah Litov <noahlitov@gmail.com>
Date: Tue, 25 Feb 2020 12:45:19 -0800
Subject: [PATCH 3/3] update labels in issue templates

---
 .github/ISSUE_TEMPLATE.md                 | 2 +-
 .github/ISSUE_TEMPLATE/bug.md             | 2 +-
 .github/ISSUE_TEMPLATE/doc.md             | 2 +-
 .github/ISSUE_TEMPLATE/feature-request.md | 2 +-
 .github/ISSUE_TEMPLATE/general-issues.md  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 87fdccb0cbb7a..3116ffd4a844d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 ---
 name: "\U00002753 General Issue"
 about: Create a new issue
-labels: status/needs-triage
+labels: needs-triage
 ---
 
 <!-- NOTE:📕 If issue regarding developer guide, please create issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 273b24583ca51..c8c28a35eff3e 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,7 +1,7 @@
 ---
 name: "\U0001F41B Bug Report"
 about: Report a bug
-labels: bug, status/needs-triage
+labels: bug, needs-triage
 ---
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/doc.md b/.github/ISSUE_TEMPLATE/doc.md
index 630e3bc8936e7..9f53191546602 100644
--- a/.github/ISSUE_TEMPLATE/doc.md
+++ b/.github/ISSUE_TEMPLATE/doc.md
@@ -1,7 +1,7 @@
 ---
 name: "📕 Documentation issue"
 about: Issue in the reference documentation or developer guide
-labels: feature-request, status/needs-triage
+labels: feature-request, needs-triage
 ---
 
 <!-- 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 7082bfc786bfc..c2812d3e6aea3 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,7 +1,7 @@
 ---
 name: "\U0001F680 Feature Request"
 about: Request a new feature
-labels: feature-request, status/needs-triage
+labels: feature-request, needs-triage
 ---
 
 <!-- short description of the feature you are proposing: -->
diff --git a/.github/ISSUE_TEMPLATE/general-issues.md b/.github/ISSUE_TEMPLATE/general-issues.md
index 18ff0ed728595..eb34c66987c42 100644
--- a/.github/ISSUE_TEMPLATE/general-issues.md
+++ b/.github/ISSUE_TEMPLATE/general-issues.md
@@ -1,7 +1,7 @@
 ---
 name: "\U00002753 General Issue"
 about: Create a new issue
-labels: status/needs-triage
+labels: needs-triage
 ---
 
 <!-- NOTE:📕 If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->