diff --git a/pom.xml b/pom.xml
index db98512d..f057ee7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
   </licenses>
 
   <properties>
-    <opendistro_security_advanceda_modules.version>1.2.0.0</opendistro_security_advanceda_modules.version>
+    <opendistro_security_advanceda_modules.version>1.3.0.0</opendistro_security_advanceda_modules.version>
     <elasticsearch.version>7.3.2</elasticsearch.version>
 
     <!-- deps -->
diff --git a/src/main/resources/static_config/static_roles.yml.rej b/src/main/resources/static_config/static_roles.yml.rej
deleted file mode 100644
index 6efe2d9d..00000000
--- a/src/main/resources/static_config/static_roles.yml.rej
+++ /dev/null
@@ -1,85 +0,0 @@
-diff a/src/main/resources/static_config/static_roles.yml b/src/main/resources/static_config/static_roles.yml	(rejected hunks)
-@@ -44,2 +44,4 @@ SGS_KIBANA_USER:
-         - ".management-beats"
-+        - "*:.tasks"
-+        - "*:.management-beats"
-       allowed_actions:
-@@ -72,2 +74,3 @@ SGS_XP_MONITORING:
-     - ".monitor*"
-+    - "*:.monitor*"
-     allowed_actions:
-@@ -102,10 +105,7 @@ SGS_XP_ALERTING:
-     - ".watches*"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".watcher-history-*"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".triggered_watches"
-+    - "*:.watches*"
-+    - "*:.watcher-history-*"
-+    - "*:.triggered_watches"
-     allowed_actions:
-@@ -137,2 +137,3 @@ SGS_XP_MACHINE_LEARNING:
-     - ".ml-*"
-+    - "*:.ml-*"
-     allowed_actions:
-@@ -154,26 +155,12 @@ SGS_KIBANA_SERVER:
-     - ".kibana"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".kibana-6"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".kibana_*"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".reporting*"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-+    - "*:.reporting*"
-     - ".monitoring*"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-+    - "*:.monitoring*"
-     - ".tasks"
--    allowed_actions:
--    - "SGS_INDICES_ALL"
--  - index_patterns:
-     - ".management-beats*"
-+    - "*:.tasks"
-+    - "*:.management-beats*" 
-     allowed_actions:
-@@ -193,6 +180,6 @@ SGS_LOGSTASH:
-   - "SGS_CLUSTER_COMPOSITE_OPS"
--  - "indices:admin/template/get"
--  - "indices:admin/template/put"
--  - "cluster:admin/ingest/pipeline/put"
--  - "cluster:admin/ingest/pipeline/get"
-+  - "SGS_CLUSTER_MANAGE_INDEX_TEMPLATES"
-+  - "SGS_CLUSTER_MANAGE_ILM"
-+  - "SGS_CLUSTER_MANAGE_PIPELINES"
-+  - "cluster:admin/xpack/monitoring*"
-   index_permissions:
-@@ -200,6 +187,2 @@ SGS_LOGSTASH:
-     - "logstash-*"
--    allowed_actions:
--    - "SGS_CRUD"
--    - "SGS_CREATE_INDEX"
--  - index_patterns:
-     - "*beat*"
-@@ -208,2 +191,7 @@ SGS_LOGSTASH:
-     - "SGS_CREATE_INDEX"
-+    - "SGS_MANAGE"
-+  - index_patterns:
-+    - "*"
-+    allowed_actions:
-+    - "indices:admin/aliases/get"
-   
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/security/test/helper/cluster/ClusterHelper.java.rej b/src/test/java/com/amazon/opendistroforelasticsearch/security/test/helper/cluster/ClusterHelper.java.rej
deleted file mode 100644
index 7c8caf41..00000000
--- a/src/test/java/com/amazon/opendistroforelasticsearch/security/test/helper/cluster/ClusterHelper.java.rej
+++ /dev/null
@@ -1,15 +0,0 @@
-diff a/src/test/java/com/amazon/opendistroforelasticsearch/security/test/helper/cluster/ClusterHelper.java b/src/test/java/com/amazon/opendistroforelasticsearch/security/test/helper/cluster/ClusterHelper.java	(rejected hunks)
-@@ -44,3 +44,3 @@ import org.elasticsearch.client.Client;
- import org.elasticsearch.cluster.health.ClusterHealthStatus;
--import org.elasticsearch.cluster.node.DiscoveryNode.Role;
-+import org.elasticsearch.cluster.node.DiscoveryNodeRole;
- import org.elasticsearch.common.settings.Settings;
-@@ -271,5 +271,5 @@ public final class ClusterHelper {
- 
--			final List<NodeInfo> masterNodes = nodes.stream().filter(n->n.getNode().getRoles().contains(Role.MASTER)).collect(Collectors.toList());
--	        final List<NodeInfo> dataNodes = nodes.stream().filter(n->n.getNode().getRoles().contains(Role.DATA) && !n.getNode().getRoles().contains(Role.MASTER)).collect(Collectors.toList());
--	        final List<NodeInfo> clientNodes = nodes.stream().filter(n->!n.getNode().getRoles().contains(Role.MASTER) && !n.getNode().getRoles().contains(Role.DATA)).collect(Collectors.toList());
-+			final List<NodeInfo> masterNodes = nodes.stream().filter(n->n.getNode().getRoles().contains(DiscoveryNodeRole.MASTER_ROLE)).collect(Collectors.toList());
-+	        final List<NodeInfo> dataNodes = nodes.stream().filter(n->n.getNode().getRoles().contains(DiscoveryNodeRole.DATA_ROLE) && !n.getNode().getRoles().contains(DiscoveryNodeRole.MASTER_ROLE)).collect(Collectors.toList());
-+	        final List<NodeInfo> clientNodes = nodes.stream().filter(n->!n.getNode().getRoles().contains(DiscoveryNodeRole.MASTER_ROLE) && !n.getNode().getRoles().contains(DiscoveryNodeRole.DATA_ROLE)).collect(Collectors.toList());
-