diff --git a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily
index d2677ff3..be8560b0 100644
--- a/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily
+++ b/jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily
@@ -1,4 +1,5 @@
-accounts_list = ["partnerlab": "matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com"]
+accounts_list = ['industry-partners': "hhalbfin@redhat.com",
+                 'verticals-ui': "brotman@redhat.com, hhalbfin@redhat.com",]
 pipeline {
     options {
         disableConcurrentBuilds()
diff --git a/jenkins/tenant/aws/ecoeng_01/README.md b/jenkins/tenant/aws/ecoeng_01/README.md
index ed84c1f9..e3339267 100644
--- a/jenkins/tenant/aws/ecoeng_01/README.md
+++ b/jenkins/tenant/aws/ecoeng_01/README.md
@@ -1,4 +1,7 @@
-### ecoeng_01
+### ecoeng_01 - dry_run=no
+
+**POLICIES_IN_ACTION** = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles"]'
 
 Accounts:
-- partnerlab: matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com
+- **industry-partners**: "hhalbfin@redhat.com",
+- **verticals-ui**: "brotman@redhat.com, hhalbfin@redhat.com",
diff --git a/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly
index e5f06503..b6909a66 100644
--- a/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly
+++ b/jenkins/tenant/aws/ecoeng_01/TaggingJenkinsfileHourly
@@ -1,4 +1,4 @@
-account = ['partnerlab']
+account = ['industry-partners', 'verticals-ui']
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -12,7 +12,6 @@ pipeline {
     }
     environment {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
-        account_name = "appeng"
         contact1 = "ebattat@redhat.com"
         contact2 = "athiruma@redhat.com"
         contact3 = "mmikhail@redhat.com"
diff --git a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily
index b761c44d..5c560fb6 100644
--- a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily
+++ b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily
@@ -1,6 +1,7 @@
 accounts_list = ['appeng': "mmikhail@redhat.com, matrujil@redhat.com, babak@redhat.com, hhalbfin@redhat.com",
-           'fsi-partner': "mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com",
-           'fsi-ecosystem': "mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com"]
+                 'fsi-partner': "mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com",
+                 'fsi-ecosystem': "mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com"
+                ]
 pipeline {
     options {
         disableConcurrentBuilds()
diff --git a/jenkins/tenant/aws/ecoeng_02/README.md b/jenkins/tenant/aws/ecoeng_02/README.md
index 4759534b..6daf3665 100644
--- a/jenkins/tenant/aws/ecoeng_02/README.md
+++ b/jenkins/tenant/aws/ecoeng_02/README.md
@@ -1,6 +1,10 @@
-### ecoeng_02
+### ecoeng_02 - dry_run=no
+
+
+**POLICIES_IN_ACTION** = '["unattached_volume", "ip_unattached", "zombie_snapshots", "unused_nat_gateway", "s3_inactive", "empty_roles"]'
+
 
 Accounts:
-- appeng: mmikhail@redhat.com, matrujil@redhat.com, babak@redhat.com, hhalbfin@redhat.com
-- fsi-partner: mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com
-- fsi-ecosystem: mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com
+- **appeng**: mmikhail@redhat.com, matrujil@redhat.com, babak@redhat.com, hhalbfin@redhat.com
+- **fsi-partner**: mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com
+- **fsi-ecosystem**: mmikhail@redhat.com, avillega@redhat.com, babak@redhat.com, hhalbfin@redhat.com
diff --git a/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly
index c10305e8..00cfb147 100644
--- a/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly
+++ b/jenkins/tenant/aws/ecoeng_02/TaggingJenkinsfileHourly
@@ -12,7 +12,6 @@ pipeline {
     }
     environment {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
-        account_name = "appeng"
         contact1 = "ebattat@redhat.com"
         contact2 = "athiruma@redhat.com"
         contact3 = "mmikhail@redhat.com"
diff --git a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily
index ac0c3984..18afb266 100644
--- a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily
+++ b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily
@@ -1,11 +1,11 @@
 accounts_list = ['coreos-training': "matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com",
-           'industry-partners': "hhalbfin@redhat.com",
-           'special-projects': "chen.yosef@redhat.com, hhalbfin@redhat.com",
-           'edgeinfra': "lgamliel@redhat.com, hhalbfin@redhat.com",
-           'specialprojects-qe': " augol@redhat.com, hhalbfin@redhat.com",
-           'ecoeng-sap': "cbrune@redhat.com, hhalbfin@redhat.com",
-           'sysdeseng': "abeekhof@redhat.com, hhalbfin@redhat.com",
-           'verticals-ui': "tjelinek@redhat.com, hhalbfin@redhat.com"]
+                 'special-projects': "chen.yosef@redhat.com, hhalbfin@redhat.com",
+                 'edgeinfra': "lgamliel@redhat.com, bthurber@redhat.com, oourfali@redhat.com, hhalbfin@redhat.com",
+                 'specialprojects-qe': "augol@redhat.com, hhalbfin@redhat.com",
+                 'ecoeng-sap': "cbrune@redhat.com, ksatarin@redhat.com, babak@redhat.com, hhalbfin@redhat.com",
+                 'sysdeseng': "scollier@redhat.com, hhalbfin@redhat.com",
+                 'partnerlab': "matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com"
+                ]
 pipeline {
     options {
         disableConcurrentBuilds()
diff --git a/jenkins/tenant/aws/ecoeng_03/README.md b/jenkins/tenant/aws/ecoeng_03/README.md
index 98a98389..ab9906eb 100644
--- a/jenkins/tenant/aws/ecoeng_03/README.md
+++ b/jenkins/tenant/aws/ecoeng_03/README.md
@@ -1,11 +1,12 @@
-### ecoeng_03
+### ecoeng_03 - dry_run=yes
+
+**POLICIES_IN_ACTION** = '[]'
 
 Accounts:
-- coreos-training: matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com
-- industry-partners: hhalbfin@redhat.com
-- special-projects: chen.yosef@redhat.com, hhalbfin@redhat.com
-- edgeinfra: lgamliel@redhat.com, hhalbfin@redhat.com
-- specialprojects-qe: augol@redhat.com, hhalbfin@redhat.com
-- ecoeng-sap: cbrune@redhat.com, hhalbfin@redhat.com
-- sysdeseng: abeekhof@redhat.com, hhalbfin@redhat.com
-- verticals-ui: tjelinek@redhat.com, hhalbfin@redhat.com
\ No newline at end of file
+- **coreos-training**: "matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com"
+- **special-projects**: "chen.yosef@redhat.com, hhalbfin@redhat.com"
+- **edgeinfra**: "lgamliel@redhat.com, bthurber@redhat.com, oourfali@redhat.com, hhalbfin@redhat.com"
+- **specialprojects-qe**: "augol@redhat.com, hhalbfin@redhat.com"
+- **ecoeng-sap**: "cbrune@redhat.com, ksatarin@redhat.com, babak@redhat.com, hhalbfin@redhat.com"
+- **sysdeseng(ecoeng-telco)**: "scollier@redhat.com, hhalbfin@redhat.com"
+- **partnerlab**: "matt.dorn@redhat.com, jomckenz@redhat.com, babak@redhat.com, hhalbfin@redhat.com"
diff --git a/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly b/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly
index b3f9d3ca..541506b4 100644
--- a/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly
+++ b/jenkins/tenant/aws/ecoeng_03/TaggingJenkinsfileHourly
@@ -1,4 +1,4 @@
-account = ['coreos-training', 'industry-partners', 'special-projects', 'edgeinfra', 'specialprojects-qe', 'ecoeng-sap', 'sysdeseng', 'verticals-ui']
+account = ['coreos-training', 'special-projects', 'edgeinfra', 'specialprojects-qe', 'ecoeng-sap', 'sysdeseng', 'partnerlab']
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -12,7 +12,6 @@ pipeline {
     }
     environment {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
-        account_name = "appeng"
         contact1 = "ebattat@redhat.com"
         contact2 = "athiruma@redhat.com"
         contact3 = "mmikhail@redhat.com"